commit before pull
fixes merge conflict
refactors sending messages to users