Fixed git merge fail