diff --git a/.gitignore b/.gitignore
index f1c959b..83335c8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 # ----------- Gradle / 构建产物 -----------
 .gradle/
 build/
@@ -26,4 +27,41 @@ Thumbs.db
 # ----------- NDK / 外部构建缓存 -----------
 .externalNativeBuild
 .cxx
-*.hprof
\ No newline at end of file
+*.hprof
+=======
+# ---> Android
+# Gradle files
+.gradle/
+build/
+
+# Local configuration file (sdk path, etc)
+local.properties
+
+# Log/OS Files
+*.log
+
+# Android Studio generated files and folders
+captures/
+.externalNativeBuild/
+.cxx/
+*.apk
+output.json
+
+# IntelliJ
+*.iml
+.idea/
+misc.xml
+deploymentTargetDropDown.xml
+render.experimental.xml
+
+# Keystore files
+*.jks
+*.keystore
+
+# Google Services (e.g. APIs or Firebase)
+google-services.json
+
+# Android Profiling
+*.hprof
+
+>>>>>>> 91bdec4aa6da285c4dd9a861e3b748515542f0b4
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..8764c00
--- /dev/null
+++ b/README.md
@@ -0,0 +1,3 @@
+# makcar
+
+马克图姆小车
\ No newline at end of file