tristan's and chris's merged