fixed merge conflict in populate tweet