Many adjustments for parsing
merge conflicts