Fixed bug with twitter branch
 Resolve merge conflict found in the  db schema.rb file