Updated messages
Trying to resolve the conflict