Added git merge notes to README