Index: src/AST/Pass.impl.hpp
===================================================================
--- src/AST/Pass.impl.hpp	(revision 89a5a1f2576dcfd1a444fd4bb7045157b2d2545a)
+++ src/AST/Pass.impl.hpp	(revision 34c32f098e353062f8da7759b872f43ad7bc5a74)
@@ -1050,4 +1050,15 @@
 	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)
@@ -1056,4 +1067,5 @@
 		maybe_accept( node, &MutexStmt::mutexObjs );
 	}
+>>>>>>> e21f2536b7495654ded040259b42b7e2325b8360
 
 	VISIT_END( Stmt, node );