bad merge diffs