I'm so bad at merging