add jishigou/thinksns
fix conflict