diff --git a/.gitignore b/.gitignore
index 047e0c8..c82c441 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 # Keil uVision project files
 *.uvproj
 *.uvprojx
@@ -56,4 +57,53 @@ MDK-ARM/
 # Build directories
 build/
 debug/
-release/
\ No newline at end of file
+release/
+=======
+# ---> uVision
+# git ignore file for Keil µVision Project
+
+# µVision 5 and µVision 4 Project screen layout file
+*.uvguix.*
+*.uvgui.*
+
+# Listing Files
+*.i
+*.lst
+*.m51
+*.m66
+*.map
+
+# Object Files
+*.axf
+*.b[0-2][0-9]
+*.b3[0-1]
+*.bak
+*.build_log.htm
+*.crf
+*.d
+*.dep
+*.elf
+*.htm
+*.iex
+*.lnp
+*.o
+*.obj
+*.sbr
+
+# Firmware Files
+*.bin
+*.h86
+*.hex
+
+# Build Files
+.bat
+
+# Debugger Files
+.ini
+
+# JLink Files
+JLinkLog.txt
+
+# Other Files
+
+>>>>>>> 9d6744208ee3694dd91395ed7d7ce03661f00d33
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..e7ec399
--- /dev/null
+++ b/README.md
@@ -0,0 +1,3 @@
+# FireAlarmCtrlCn
+
+火灾报警控制器CN
\ No newline at end of file