added message stuff
fixed conflict