cleaned commented lines
removed conflict resolution steps
removed n-grams
removed make_basic_block4
removed options
Changed parameters