Clearly, I am terrible at merging