oh blah
conflict resolution