Fix message.
Resolve merge conflict.