Fixed git merge conflict hiccup