* reseolved merge conflicts
* clean g2 sql script