fix merge crud