Parser fine tuning
Fixed merge conflicts