fixing merge conflict in core-messages.properties