Added the Conversation Fragment
solved merge conflict