diff --git a/.gitignore b/.gitignore
index b9d61ed..18430ed 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,6 @@
+<<<<<<< HEAD
 /cpp/wiipair/.settings
 /cpp/wiipair/Release/src
+=======
+/java/bin
+>>>>>>> c9d82ef8e884d27d6c5215d5b2fb851cf81162f8
diff --git a/java/client.jar b/java/client.jar
index 38a8e8b..15b5e21 100644
Binary files a/java/client.jar and b/java/client.jar differ
diff --git a/java/main.jar b/java/main.jar
index c99b430..d6166a0 100644
Binary files a/java/main.jar and b/java/main.jar differ