- Added -l flag to bison
- Fix conflicts