implementing newer conflict detection