Fixing Merge