concerns interface modifications
conflict resolution