added html diffs for merge conflicts