Corrected incorrect message
Fixed merge conflict