fixed messages pages + json error
conflict resolved