advanced Conflict code
update to my advanced conflict