remove CONFLICT