flow of messages working
completing merge