Deal with merge conflicts directly

No match.