Diffmerge resolve all conflicts with right