Fixing Merge Sync