Making messages show up
fixing conflict