fixed some merge bugs
added order by parsing for select and infer
added order by for estimate columns