git merge code behind