diff --git a/xCAT-server/lib/xcat/plugins/yaboot.pm b/xCAT-server/lib/xcat/plugins/yaboot.pm
index f77b86416..3ce67366f 100644
--- a/xCAT-server/lib/xcat/plugins/yaboot.pm
+++ b/xCAT-server/lib/xcat/plugins/yaboot.pm
@@ -725,14 +725,8 @@ sub process_request {
       if ($errored) { 
 	  my $rsp;
 	  $rsp->{errorcode}->[0]=1;
-<<<<<<< HEAD
-	  $rsp->{error}->[0]="Failed in running end prescripts\n";
-	  $::YABOOT_callback->($rsp);
-	  return; 
-=======
 	  $rsp->{error}->[0]="Failed in running end prescripts.  Processing will still continue.\n";
-	  $callback->($rsp);
->>>>>>> 78b8d21... defect 4147 - allow nodeset to continue if prescript errors
+	  $::YABOOT_callback->($rsp);
       }
   }
 }