Added a personalized message
Fix merge conflict