Updated parser.py
Fixing merge conflicts