Clearly figuring out this git merge dance