fix merge fup