Index: src/AST/Pass.impl.hpp
===================================================================
--- src/AST/Pass.impl.hpp	(revision 34c32f098e353062f8da7759b872f43ad7bc5a74)
+++ src/AST/Pass.impl.hpp	(revision ab1a9eafbfbfde7a15d7abe89546c76433b4e25c)
@@ -1050,15 +1050,4 @@
 	VISIT_START( node );
 
-<<<<<<< HEAD
-	VISIT(
-		maybe_accept( node, &MutexStmt::mutexObjs );
-		{
-			// mutex statements introduce a level of scope (for the initialization)
-			guard_symtab guard { *this };
-			maybe_accept( node, &MutexStmt::stmt );
-			
-		}
-	)
-=======
 	if ( __visit_children() ) {
 		// mutex statements introduce a level of scope (for the initialization)
@@ -1067,5 +1056,4 @@
 		maybe_accept( node, &MutexStmt::mutexObjs );
 	}
->>>>>>> e21f2536b7495654ded040259b42b7e2325b8360
 
 	VISIT_END( Stmt, node );