diff --git a/src/passes/1-parser/pascaligo/AST.ml b/src/passes/1-parser/pascaligo/AST.ml
index a39c2bec7..214daaafe 100644
--- a/src/passes/1-parser/pascaligo/AST.ml
+++ b/src/passes/1-parser/pascaligo/AST.ml
@@ -49,10 +49,6 @@ type kwd_contains   = Region.t
 type kwd_down       = Region.t
 type kwd_else       = Region.t
 type kwd_end        = Region.t
-<<<<<<< HEAD
-=======
-type kwd_fail       = Region.t
->>>>>>> e5e9fb8e2faa1a67595553ab83279d3eb2b64470
 type kwd_for        = Region.t
 type kwd_from       = Region.t
 type kwd_function   = Region.t
diff --git a/src/passes/1-parser/pascaligo/AST.mli b/src/passes/1-parser/pascaligo/AST.mli
index f5a09536e..15e7e9883 100644
--- a/src/passes/1-parser/pascaligo/AST.mli
+++ b/src/passes/1-parser/pascaligo/AST.mli
@@ -33,10 +33,6 @@ type kwd_contains   = Region.t
 type kwd_down       = Region.t
 type kwd_else       = Region.t
 type kwd_end        = Region.t
-<<<<<<< HEAD
-=======
-type kwd_fail       = Region.t
->>>>>>> e5e9fb8e2faa1a67595553ab83279d3eb2b64470
 type kwd_for        = Region.t
 type kwd_from       = Region.t
 type kwd_function   = Region.t
diff --git a/src/passes/1-parser/pascaligo/ParToken.mly b/src/passes/1-parser/pascaligo/ParToken.mly
index 4f0a70cf3..e400947cb 100644
--- a/src/passes/1-parser/pascaligo/ParToken.mly
+++ b/src/passes/1-parser/pascaligo/ParToken.mly
@@ -53,10 +53,6 @@
 %token <Region.t> Down        (* "down"       *)
 %token <Region.t> Else        (* "else"       *)
 %token <Region.t> End         (* "end"        *)
-<<<<<<< HEAD
-=======
-%token <Region.t> Fail        (* "fail"       *)
->>>>>>> e5e9fb8e2faa1a67595553ab83279d3eb2b64470
 %token <Region.t> For         (* "for"        *)
 %token <Region.t> Function    (* "function"   *)
 %token <Region.t> From        (* "from"       *)
diff --git a/src/passes/1-parser/pascaligo/Tests/crowdfunding.ligo b/src/passes/1-parser/pascaligo/Tests/crowdfunding.ligo
index 5d649d2ca..12e516534 100644
--- a/src/passes/1-parser/pascaligo/Tests/crowdfunding.ligo
+++ b/src/passes/1-parser/pascaligo/Tests/crowdfunding.ligo
@@ -10,7 +10,7 @@ function back (var store : store) : list (operation) * store is
   var operations : list (operation) := list []
   begin
     if now > store.deadline then
-      fail "Deadline passed";
+      failwith ("Deadline passed");
     else
       case store.backers[sender] of [
         None -> store.backers[sender] := amount
@@ -23,14 +23,14 @@ function claim (var store : store) : list (operation) * store is
   var operations : list (operation) := nil
   begin
     if now <= store.deadline then
-      fail "Too soon."
+      failwith ("Too soon.")
     else
       case store.backers[sender] of
         None ->
-          fail "Not a backer."
+          failwith ("Not a backer.")
       | Some (amount) ->
           if balance >= store.goal or store.funded then
-            fail "Goal reached: no refund."
+            failwith ("Goal reached: no refund.")
           else
             begin
               operations := list [transaction (unit, sender, amount)];
@@ -49,7 +49,7 @@ function withdraw (var store : store) : list (operation) * store is
  // or:      patch store with record funded = True end;
              operations := list [Transfer (owner, balance)];
         };
-        else fail "Below target."
+        else failwith ("Below target.")
       else fail "Too soon.";
     else skip
   end with (operations, store)