Clarified messages.
Merge resolved.