fix merge (2/2)