Fixed the git merge conflict shenanigans