tweet api
fixed merge conflict