fix merge (again...)