Use merge-recursive in git-am -3.