Fix merge conflicts and invalid parentheses#23

RohitM-IN merged 2 commits intoRohitM-IN:mainRohitM-IN/SQLParser:mainfrom

ShreyashKothe:developmentShreyashKothe/SQLParser:developmentCopy head branch name to clipboard