diff --git a/vc-p4.el b/vc-p4.el
index a9c4d01..9f1cc49 100644
--- a/vc-p4.el
+++ b/vc-p4.el
@@ -112,18 +112,18 @@
 	      ;; return version of starting point
 	      (vc-branch-part branch)))))))
 
-(if (not (fboundp 'vc-default-resolve-select-yours))
-    (defun vc-maybe-resolve-conflicts (file status &optional name-A name-B)
-      (vc-resynch-buffer file t (not (buffer-modified-p)))
-      (if (zerop status) (message "Merge successful")
-	(if (fboundp 'smerge-mode) (smerge-mode 1))
-	(if (y-or-n-p "Conflicts detected.  Resolve them now? ")
-	    (if (and (fboundp 'smerge-ediff)
-		     (not (vc-find-backend-function (vc-backend file)
-						    'resolve-select-yours)))
-		(smerge-ediff)
-	      (vc-resolve-conflicts name-A name-B))
-	  (message "File contains conflict markers"))))
+(if (fboundp 'vc-default-resolve-select-yours) t
+  (defun vc-maybe-resolve-conflicts (file status &optional name-A name-B)
+    (vc-resynch-buffer file t (not (buffer-modified-p)))
+    (if (zerop status) (message "Merge successful")
+      (if (fboundp 'smerge-mode) (smerge-mode 1))
+      (if (y-or-n-p "Conflicts detected.  Resolve them now? ")
+	  (if (and (fboundp 'smerge-ediff)
+		   (not (vc-find-backend-function (vc-backend file)
+						  'resolve-select-yours)))
+	      (smerge-ediff)
+	    (vc-resolve-conflicts name-A name-B))
+	(message "File contains conflict markers"))))
 
   (defun vc-default-resolve-select-yours (backend)
     (goto-char (point-min))