terrible merging part 1