fix colunm alias select bug
solve conflict