Update extensions/src/org/pentaho/platform/plugin/services/messages/messages.properties

Removed the conflict messages