fix merge failure