SONAR-4309 fix detection of conflicts