fix merge gone astray