Fixed merge diffs in dc & dc2