fix merge statements