diff --git a/README.md b/README.md
index 974fcaf..b0ff56a 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 # Deathwatch Roller
 
 ## Project Description
@@ -38,3 +39,7 @@ This project is licensed under the MIT License. See the LICENSE file for details
 ## Learn More
 - [React Documentation](https://reactjs.org/)
 - [Create React App Documentation](https://create-react-app.dev/)
+=======
+# dwroller
+dwroller
+>>>>>>> 18513bcff9028e31a5b4d35eba2f4deb6bf4439c