I have this problem to fix the conflict
The meld tool "doesn't let me commit" the change on the middle, and this are the new changes that I need to commit.
I type:
$ git checkout MyBranch
$ git merge master
and the inverse
$ git checkout MyBranch
$ git merge master
and I did not get yet.