diff --git a/src/lib.rs b/src/lib.rs
index 91f32070..7731db56 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -379,4 +379,3 @@ impl Agent {
             .unwrap();
     }
 }
->>>>>>> lm-master