diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..aa25188
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+/target/
+/logs/
+/.idea/
\ No newline at end of file
diff --git a/README.md b/README.md
index 1380d0d..2d1f09a 100644
--- a/README.md
+++ b/README.md
@@ -1 +1,7 @@
+<<<<<<< HEAD
 bfd翻译应用
+=======
+# analyst_translate
+
+文字翻译
+>>>>>>> branch 'master' of http://82.156.111.58:3000/maojian/analyst_translate.git