diff --git a/python/py_igl.cpp b/python/py_igl.cpp
index 0589a1532..44ce16b31 100644
--- a/python/py_igl.cpp
+++ b/python/py_igl.cpp
@@ -12,11 +12,8 @@
 #include <igl/avg_edge_length.h>
 #include <igl/barycenter.h>
 #include <igl/barycentric_coordinates.h>
-<<<<<<< HEAD
 #include <igl/barycentric_to_global.h>
-=======
 #include <igl/boundary_conditions.h>
->>>>>>> upstream/master
 #include <igl/boundary_facets.h>
 #include <igl/boundary_loop.h>
 #include <igl/cat.h>