Fixed git merge problem