More work on git merge.
Addressed comments.