fixed git merge confusion