support multiple kinds of conflicts