merge cannontech to gsn master