git commit
merge successful