still trying to understand git merge