terrible merging part 2