resolved conflix in src/parser/postgresparser.cpp.
resolved conflix in src/parser/postgresparser.cpp.

ShuxinLin/peloton,ShuxinLin/peloton,ShuxinLin/peloton,ShuxinLin/peloton,ShuxinLin/peloton,ShuxinLin/peloton