added message editing ability
trying to push
resolved conflicts