diff --git a/releng/org.eclipse.papyrus.information.modeling.rcp/plugin_customization.ini b/releng/org.eclipse.papyrus.information.modeling.rcp/plugin_customization.ini
index c27e8d7..dc5b489 100755
--- a/releng/org.eclipse.papyrus.information.modeling.rcp/plugin_customization.ini
+++ b/releng/org.eclipse.papyrus.information.modeling.rcp/plugin_customization.ini
@@ -33,6 +33,7 @@
 # Configure collaborative modeling preferences
 org.eclipse.emf.compare.ide.ui/org.eclipse.emf.compare.ide.ui.preference.preMergeOnConflict=true
 org.eclipse.emf.compare.ide.ui/org.eclipse.emf.compare.ide.ui.preference.resolutionScope=WORKSPACE
+org.eclipse.emf.compare.rcp/org.eclipse.emf.compare.preference.conflict.detector=org.eclipse.emf.compare.rcp.fast.conflictDetector
 org.eclipse.egit.ui/enable_logical_model=true
 org.eclipse.egit.core/core_preferredMergeStrategy=model recursive