Message (minor bug)

Message (minor bug)
Conflict

Conflict