- Removed unneeded non-terminal rule
- Fixing parser conflicts