Reimplement file of messages
merge conflicts*