sample ngram soln
lesson 11
merge conflict