Khloe and Tristan has temporarily reconciled