Fixed bug with &songartist and achievement messages
Fixed merge conflict