Fixed git merge glitch