diff --git a/README.md b/README.md
index 0c83cde2ce793a26e49d9a3ef8b180384cdc5a38..0c0f78bf638daa735907f794b9d79dd7949b251c 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 # Getting Started with Create React App
 
 This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app).
@@ -68,3 +69,7 @@ This section has moved here: [https://facebook.github.io/create-react-app/docs/d
 ### `npm run build` fails to minify
 
 This section has moved here: [https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify](https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify)
+=======
+# Web_final_project
+
+>>>>>>> f4d9467be1fe1ceed7d60843fca5a6f878f26342