remove g alias avoid of confilict
merge confilict