allow conflicts between word alignments and the parse
merge