Merge (again)