Fixed the messsages
merge