Consolidated Messages some
resolved conflicts from consolidating messages