conflict check
yupeiii