working on messages and posts
working on messages and posts
fixing merge conflicts