Comment by efreak

`git add .; git merge continue` also "solves" the conflict