Removed some merge diffs.