update script for ganji agent
solve conflicts