git merge trial commit