diff --git a/.gitignore b/.gitignore
index e56ab3687..52c882a9d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,7 +10,4 @@ cheditor*/
 ckeditor43/
 log/
 g5_tree/
-<<<<<<< HEAD
-=======
 naver*.html
->>>>>>> g5