fix merge test