Trying to clean up some sort of git merge disaster