merge conflict commit on master
branch merge commit
merge conflict resolved