change the field of CFunc; add str.__int__
resolve push conflict