Jheez, these merges never work to plan