update to my advanced conflict