treat conflicts as OK