I suck at merging