nl_tokens: Merge solved Conflicts back into a TreeConflict . Unsolved conflicts default to keep base .
pl_tokens: function solveTree ( treeConflict , solved ) { solved = treeConflict . getConflicts ( ) . merge ( solved ) // Solve unresolved conflicts . map ( function defaultSolve ( conflict ) { if ( ! conflict . isSolved ( ) ) { return conflict . keepBase ( ) ; } else { return conflict ; } } ) ; return treeConflict . <mask> ( 'conflicts' , solved ) ; }