fix pom merge issues; remove runtime scope

pom.xml

@@ -228,20 +228,17 @@
         	<groupId>org.apache.hive</groupId>
         	<artifactId>hive-metastore</artifactId>
         	<version>0.14.0</version>
-        	<scope>runtime</scope>
         </dependency>
         <dependency>
         	<groupId>com.google.code.gson</groupId>
         	<artifactId>gson</artifactId>
-        	<scope>runtime</scope>
         	<version>2.3.1</version>
         </dependency>
+        <dependency>
             <groupId>it.unimi.dsi</groupId>
             <artifactId>fastutil</artifactId>
             <version>${fastutil.version}</version>
         </dependency>
-
->>>>>>> add fastutil dependency
     </dependencies>
 
     <build>