remaining git merge