Changing msg
solving merge issues