terrible merging part 3