messages model
fix merge conflicts