merge conflict resolution
merge conflict resolution
Fixed bug to associate user name with post