Conflicted merges hand back all contents