diff --git a/.gitignore b/.gitignore
index d34eaf9..f47f3bd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,49 +1,21 @@
 .project
-.settings/
-client/.classpath
-client/.project
-client/.settings/
-client/target/
-<<<<<<< HEAD
-<<<<<<< HEAD
-client/.gwt/
-=======
->>>>>>> add gitignore to ignore files by git
-=======
-client/.gwt/
->>>>>>> update git ignore
-mock/.classpath
-mock/.project
-mock/.settings/
-mock/target/
-server/.classpath
-server/.project
-server/.settings/
-server/target/
-server/war/
-shared/.classpath
-shared/.project
-shared/.settings/
-shared/target/
-target/
-widgets/.classpath
-widgets/.project
-widgets/.settings/
-widgets/target/
-<<<<<<< HEAD
-<<<<<<< HEAD
-
-client/src/main/gwt-unitCache/
-client/src/main/webapp/WEB-INF/deploy/
-client/src/main/webapp/hupa/
-=======
->>>>>>> add gitignore to ignore files by git
-=======
-
-<<<<<<< HEAD
->>>>>>> update git ignore
-=======
-client/src/main/gwt-unitCache/
-client/src/main/webapp/WEB-INF/deploy/
-client/src/main/webapp/hupa/
->>>>>>> layout the label setting view
+.settings
+.classpath
+.gwt
+gwt-unitCache
+webapp/WEB-INF/deploy
+webapp/hupa
+target
+war
+www-test
+*~
+*diff
+*.tar
+*.log
+tmp
+._*
+build
+DS_Store
+*.swp
+.factorypath
+.DS_Store
diff --git a/hupa/src/main/java/org/apache/hupa/HupaProd.gwt.xml b/hupa/src/main/java/org/apache/hupa/HupaProd.gwt.xml
index b436d47..d6dbb75 100644
--- a/hupa/src/main/java/org/apache/hupa/HupaProd.gwt.xml
+++ b/hupa/src/main/java/org/apache/hupa/HupaProd.gwt.xml
@@ -29,7 +29,7 @@
   <set-configuration-property name="locale.useragent" value="Y"/>
 
   <!-- Compile for all browsers -->
-  <set-property name="user.agent" value="gecko1_8,safari,opera,ie6,ie8,ie9"/>
+  <set-property name="user.agent" value="gecko1_8,safari,ie9"/>
 
   <set-configuration-property name="CssResource.style" value="obf"/>
   
diff --git a/pom.xml b/pom.xml
index 4e0ea00..9b89a19 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,8 +57,8 @@
         </site>
     </distributionManagement>
     <properties>
-        <gwtVersion>2.5.1</gwtVersion>
-        <gwtMavenVersion>2.5.1</gwtMavenVersion>
+        <gwtVersion>2.6.0</gwtVersion>
+        <gwtMavenVersion>2.6.0</gwtMavenVersion>
         <gwt.moduleSuffix />
         <gwt.logLevel>INFO</gwt.logLevel>
         <jettyVersion>7.3.0.v20110203</jettyVersion>