Fixed merge

I fixed the merge problems in lexemesTypes.cpp