Exchange and assemble diff conflict content