Fix merge issues in twitter.js