diff --git a/README.md b/README.md
index 0b85536c89a9a76bbf5079476d0c6df9371f093f..b7bdd942ef43232bbd1d65a43c1cf064e9ab4714 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 ## 202128306
 
 ## 2023/05/03
@@ -16,3 +17,14 @@ int main()
 
 * This is *italic* **bold** ***three***
 * Change Editor
+=======
+# FOSS2023-1
+
+## PHAM MINH TUAN
+
+## 202128306
+
+### 2023/05/01
+
+실습 다렉토리를 모두 복사함
+>>>>>>> 7f5827911647266b324f07dd106d13420a40abdf
diff --git a/lab0508/note.md b/lab0508/note.md
index b9b9c9cfed830ecc4962f273024feb5c9d677eb5..27cf5026bf9be53b47219623f314c3b2afd9462a 100644
--- a/lab0508/note.md
+++ b/lab0508/note.md
@@ -7,3 +7,8 @@ word
 word
 word word
 
+* Web - Edit - 1111
+* Web - Edit - 2222
+* SSH - Edit - 3333
+
+