Added a good morning message
resolved the conflict