fix merge error on entity