updated message model
merged from inventory
resolved user model conflicts