Simplify the logic by relocating calls to merge.
Simplify the logic by relocating calls to merge.

Now that the code is using callbacks to handle merged and conflicted content
it seems to make the logic simpler to call it as soon as content gets merged.

Change-Id: I83f330738867322abb53fb7a0a582fad125b8d64

ecbaldwin/textile,ecbaldwin/textile,ecbaldwin/textile,ecbaldwin/textile