merging master with messaging