modify merge diffs style