fix merge error: delete states