swig gyp
merge