owens eidt
conflict resolve