merging chris