Resolve warnings in LexerTest
Fix conflicts in README