Message property file conflicts has been resolved.

Message property file conflicts has been resolved.