Hot diggity Git, you're so bad at merging