Fixing Dirty Merge