Cleaning up merge (again)