From cc82fc77224e153d62bfe99d06ee7461db25c048 Mon Sep 17 00:00:00 2001
From: Protryon <max.bruce12@gmail.com>
Date: Wed, 17 Feb 2021 08:38:14 -0800
Subject: [PATCH] fix conflict

---
 asg/tests/pass/circuits/mod.rs | 2 +-
 asg/tests/pass/field/mod.rs    | 2 +-
 asg/tests/pass/group/mod.rs    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/asg/tests/pass/circuits/mod.rs b/asg/tests/pass/circuits/mod.rs
index ff8c661ec7..3c9f701892 100644
--- a/asg/tests/pass/circuits/mod.rs
+++ b/asg/tests/pass/circuits/mod.rs
@@ -133,5 +133,5 @@ fn test_circuit_explicit_define() {
         let x: One = One {x: 5};
     }
     "#;
-    load_asg(program_string).unwrap();
+    load_asg(&new_context(), program_string).unwrap();
 }
diff --git a/asg/tests/pass/field/mod.rs b/asg/tests/pass/field/mod.rs
index d58e30e74b..eb8553f178 100644
--- a/asg/tests/pass/field/mod.rs
+++ b/asg/tests/pass/field/mod.rs
@@ -37,7 +37,7 @@ fn test_add_explicit() {
         let c: field = 0field + 1field;
     }
     "#;
-    load_asg(program_string).unwrap();
+    load_asg(&new_context(), program_string).unwrap();
 }
 
 #[test]
diff --git a/asg/tests/pass/group/mod.rs b/asg/tests/pass/group/mod.rs
index 61294c8d43..a80dc664d8 100644
--- a/asg/tests/pass/group/mod.rs
+++ b/asg/tests/pass/group/mod.rs
@@ -113,7 +113,7 @@ fn test_add_explicit() {
         let c: group = 0group + 1group;
     }
     "#;
-    load_asg(program_string).unwrap();
+    load_asg(&new_context(), program_string).unwrap();
 }
 
 #[test]