Remove shift-reduce conflict from expr-parsing
Removed AND, OR and NOT shift reduce conflicts