diff --git a/src/api/ml/z3.ml b/src/api/ml/z3.ml
index 705f9a3e7..61ac503a0 100644
--- a/src/api/ml/z3.ml
+++ b/src/api/ml/z3.ml
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 (* File generated from z3.idl *)
 
 type context
@@ -3383,3 +3384,16 @@ let set_new_relevant_callback th cb =
 
 end
 
+=======
+(* 
+   Author: CM Wintersteiger
+   (C) Microsoft Research, 2012
+*)
+
+open Z3enums
+open Z3native
+
+module Z3 = struct
+
+end
+>>>>>>> More new ML API.