Message property file conflicts has been resolved.