diff --git a/falsework-client/src/test/java/TableViewSample.java b/falsework-client/src/test/java/TableViewSample.java
index 60deb76..19fce04 100644
--- a/falsework-client/src/test/java/TableViewSample.java
+++ b/falsework-client/src/test/java/TableViewSample.java
@@ -1,4 +1,7 @@
+<<<<<<< HEAD
 import com.fx.server.vo.UserVO;
+=======
+>>>>>>> 6fa352c50bee89ed3f768a2360e651f447f94c96
 import javafx.application.Application;
 import javafx.beans.property.IntegerProperty;
 import javafx.beans.property.ListProperty;
diff --git a/falsework-sever/pom.xml b/falsework-sever/pom.xml
index c593c60..d26fccf 100644
--- a/falsework-sever/pom.xml
+++ b/falsework-sever/pom.xml
@@ -104,7 +104,7 @@
             <artifactId>DmJdbcDriver</artifactId>
             <version>1.0.0</version>
             <scope>system</scope>
-            <systemPath>${basedir}/libs/DmJdbcDriver-1.0.0.jar</systemPath>
+            <systemPath>${pom.basedir}/libs/DmJdbcDriver-1.0.0.jar</systemPath>
         </dependency>
 
         <dependency>
@@ -112,7 +112,7 @@
             <artifactId>pinyin4j</artifactId>
             <version>2.5.0</version>
             <scope>system</scope>
-            <systemPath>${basedir}/libs/pinyin4j-2.5.0.jar</systemPath>
+            <systemPath>${pom.basedir}/libs/pinyin4j-2.5.0.jar</systemPath>
         </dependency>
     </dependencies>
 
@@ -130,6 +130,14 @@
                     </excludes>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.22.2</version>
+                <configuration>
+                    <skipTests>true</skipTests>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 
diff --git a/pom.xml b/pom.xml
index 1e75ed7..f7ff2d9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+         xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.epri</groupId>
@@ -10,6 +11,7 @@
 
     <modules>
         <module>falsework-client</module>
+        <module>falsework-sever</module>
     </modules>
     <properties>
         <java.version>1.8</java.version>
@@ -28,6 +30,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.1</version>
                 <configuration>
                     <source>${java.version}</source>
                     <target>${java.version}</target>