diff --git a/.gitignore b/.gitignore
index 667aaef..a2f0332 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 HELP.md
 target/
 .mvn/wrapper/maven-wrapper.jar
@@ -31,3 +32,31 @@ build/
 
 ### VS Code ###
 .vscode/
+=======
+# ---> Java
+# Compiled class file
+*.class
+
+# Log file
+*.log
+
+# BlueJ files
+*.ctxt
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.nar
+*.ear
+*.zip
+*.tar.gz
+*.rar
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+replay_pid*
+
+>>>>>>> 3012a74fb7c44026907ee929a5832e4986ec7a46
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..2149d25
--- /dev/null
+++ b/README.md
@@ -0,0 +1,2 @@
+# my-springboot-project
+