fix merge, require