worked on the message storage
merging conflict