Fix Merge (attempt 2)