conversation adds messages
fixed conflicts
Conversation displaye in order