Apparently I don't know how to git merge...