diff --git a/.gitignore b/.gitignore
index fb6b53b..c0b1724 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,11 @@
 /appRelease/test.release
 /sdk/include/SQLiteCpp
 /appRelease/mysql/mysql-arm.tar
+<<<<<<< HEAD
 /applications/examples/jsondemo2/x64
 /applications/examples/jsondemo2/jsondemo2.vcxproj.filters
 /applications/examples/jsondemo2/jsondemo2.vcxproj.user
+=======
+/applications/ems_datahubs/.vs
+/applications/ems_datahubs/obj
+>>>>>>> bce2956dae20109467a3385b24f36983f0e31914