test conflict prabees
test conflict clear