add popular tweets to message model
fixed merge conflict