add numpy
add sys
solve conflict