Add detection for conflicts such as two files using one version.