* fix --conflict skip behaviour for fn:replace

website/data/query-blacklist.txt

@@ -90,7 +90,6 @@ ded
 Demonoid
 Director's.Cut
 Directors.Cut
-Discovery.Channel
 DL
 DLLValley
 DLLValley.eu

website/data/release-groups.txt

@@ -614,6 +614,7 @@ Gogeta
 GokU61
 GoLDSToNE
 GOOGLE
+Gopo
 GORE
 GOREHOUNDS
 GOTHiC

website/scripts/replace.groovy

@@ -14,11 +14,15 @@ args.getFiles{ accept(it)  }.each{
 		
 		// override files only when --conflict override is set
 		if (!it.equals(nfile)) {
-			if ((nfile.exists() || _args.conflict == 'override') && action != StandardRenameAction.TEST) {
+			if (nfile.exists() && _args.conflict == 'override' && action != StandardRenameAction.TEST) {
 				nfile.delete(); // resolve conflict
 			}
 			
-			println action.rename(it, nfile)
+			if (!nfile.exists()) {
+				println action.rename(it, nfile)
+			} else {
+				println "Skipped $nfile"
+			}
 		}
 	}
 }