otec: cleaned up conflict resolution logic