add 8 fenzhi1
add 999 master
conflict resoved