merged rm-message-passing
resolved pull conflict