diff --git a/.gitignore b/.gitignore
index 18430ed..4afe7ef 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,10 @@
 <<<<<<< HEAD
+<<<<<<< HEAD
 /cpp/wiipair/.settings
 /cpp/wiipair/Release/src
 =======
 /java/bin
 >>>>>>> c9d82ef8e884d27d6c5215d5b2fb851cf81162f8
+=======
+/cpp/wiiuse/Debug/src
+>>>>>>> develop-wiiuse