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