Further Merge Fixing