I don't like then name "add" here. Perhaps instead call this formatWithConflicts()?

Since this is being introduced, it should also be added to MergeCommand so that conflicted merges include the Conflicts section (because I don't think they do today).