diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000000000000000000000000000000000000..8ea9ac9db8bb5624861c6a944aa14e47ce1c1523
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+pom.xml merge=ours
diff --git a/README.md b/README.md
index 57881f1c3fbbeb8d45b390ed9048b2ef216abeea..ee3cd64ca8134287171fe5eb02484ca1f619f473 100644
--- a/README.md
+++ b/README.md
@@ -1 +1 @@
-test.
\ No newline at end of file
+test.c dcdd
diff --git a/pom.xml b/pom.xml
index 1acd39c5b4d3b4aa4c3e0edc54a1d3d8c5abf117..c999ecd692c143062adb7d5d9b11f8ce4839f013 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@ limitations under the License.
         <relativePath>../neatlogic-parent</relativePath>
     </parent>
     <artifactId>neatlogic-test</artifactId>
-    <version>0.3.0.0-SNAPSHOT</version>
+    <version>3.1.0</version>
     <build>
         <resources>
             <resource>