add their diffs and mine diffs when solving conflict