add sinaWeiboToken
.
fix conflict