diff --git a/lab1126/note3.md b/lab1126/note3.md
index 319a281cca45bff6f82d131ca6fa2ce6639e888f..6729d81ece7c8deeebe6fbfc9e35f103d68d8b5e 100644
--- a/lab1126/note3.md
+++ b/lab1126/note3.md
@@ -1,8 +1,13 @@
 # 1126 lab
 
+<<<<<<< HEAD
 wfwe
 f
 wf
 wf
 wagwg
 
+=======
+
+In Web edited
+>>>>>>> 170e7bace3f3b288a8228ea42f08fd8700a1d274