fix merge stuff