Almost done with lexical analyzer
Merge conflict