fix merge (again)