weibo login
solve merge conflicts