need to merge user model
merging message model
merged master