diff --git a/.gitignore b/.gitignore
index b83d222..3969dab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,30 @@
+<<<<<<< HEAD
 /target/
+=======
+# ---> 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*
+
+>>>>>>> branch 'main' of https://gitrepo.62816222.work/carlynne/RestBoard.git
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..2451ede
--- /dev/null
+++ b/README.md
@@ -0,0 +1,3 @@
+# RestBoard
+
+게시판 실습
\ No newline at end of file