clean fileIO, numpy, dict.
fix conflix step 1
fix conflit 2