Move `merge` and `TokenName` from utils to parser
Merge branch 'cleancore' into develop