misc
conflict resolution