Fixed git merge problems