diff --git a/scm-webapp/pom.xml b/scm-webapp/pom.xml
index d04ffa5d01..d1c6491f73 100644
--- a/scm-webapp/pom.xml
+++ b/scm-webapp/pom.xml
@@ -196,6 +196,14 @@
       <version>${guava.version}</version>
     </dependency>
     
+    <!-- fix version conflict -->
+    
+    <dependency>
+      <groupId>org.apache.httpcomponents</groupId>
+      <artifactId>httpclient</artifactId>
+      <version>4.2.6</version>
+    </dependency>
+    
     <!-- template engine -->
 
     <dependency>