added color for conversations
resolved conflicts