Automatically expand existing merge conflicts when merging.

This avoids the need for the merge function to handle any existing
merge conflicts manually, and ensures that we only ever end up with
one level of merge conflict at a time, which makes things easier for
calling code that wants to analyse the possibilities of a merge conflict.