git merge fail corrected