diff --git a/try_smg/counter.v b/try_smg/counter.v
index e9a6e4b..ff8f973 100644
--- a/try_smg/counter.v
+++ b/try_smg/counter.v
@@ -9,11 +9,7 @@ begin
     if (!rst_n)
         count <= 0;
     else if (enable == 1'b1)
-<<<<<<< HEAD
-        count <= count + 1;
-end//
-=======
-        count <= count + 1;//00sss
+        count <= count + 1;//aabbcc
 end
->>>>>>> 3dc244fbc9669daee2436d70f0933dbd577fece0
+
 endmodule
\ No newline at end of file