animation of messages
resolved merge conlict
small changes