diff --git a/README.md b/README.md
index 667d730..e6bdf99 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,33 @@
-<<<<<<< HEAD
+# Google-Keep-Clone
+A React-based Google Keep Clone built with Material-UI
+
+## Overview
+
+This project is a clone of Google Keep, a note-taking application, implemented using React and Material-UI. The application offers a clean and intuitive user interface for creating, editing, and organizing notes.
+
+## Features
+
+- **Responsive Design**: The application is designed to be responsive, ensuring a seamless experience across different devices.
+
+- **Material-UI Integration**: Leveraging the power of Material-UI components, the project maintains a modern and aesthetic design.
+
+- **React Router**: Utilizing React Router for client-side navigation, providing a smooth and dynamic user experience without full page reloads.
+
+- **State Management**: Different state management techniques are employed, including local component state, lifting state up, and Context API for efficient and organized state handling.
+
+- **Context Hooks**: Context hooks are used to manage and share state between components, reducing prop drilling and enhancing code maintainability.
+
+## Getting Started
+
+Follow these steps to run the project locally:
+
+1. Clone the repository:
+
+   ```bash
+   git clone https://github.com/your-username/Google-Keep-Clone.git
+   cd Google-Keep-Clone
+
+
 # Getting Started with Create React App
 
 This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app).
@@ -70,5 +99,6 @@ This section has moved here: [https://facebook.github.io/create-react-app/docs/d
 
 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)
 =======
-# Google-Keep-Clone
->>>>>>> a4f1388be27862f74c876fc4162287c48c67ff7e
+
+
+