Added simple url conflict checks, refs #1878
Merge pull request #2114 from cmfcmf/conflict-checks

Added simple url conflict checks, refs #1878