committing some changes to check shift reduce conflicts
Fixing reduce/shift conflicts and adding while loops