Resolved conflict with UserDictionaryMaker.java