add so cool in 1.txt
haha
add liuyanjun in 1.txt
fix conflict