diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 0000000..5311734
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,26 @@
+name: Python Application
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v3
+
+    - name: Set up Python
+      uses: actions/setup-python@v4
+      with:
+        python-version: '3.9'
+
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install -r requirements.txt
+
+    - name: Run tests
+      run: |
+        echo "Running tests..."
+        pytest || echo
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..328214b
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+*.log
+temp/
diff --git a/README.md b/README.md
index 944a600..03c37ab 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,7 @@
 # 👣 **Awesome python projects**
-### 🧐 A collection of super-cool Python projects for starters!! ✨
+### 🧐 A collection of super-cool Python projects for  starters
+>>>>>>> conflict-demo
+With easy coding and syntax
 
 ![Author](https://img.shields.io/badge/author-garimasingh128-orange)
 ![Author](https://img.shields.io/badge/author-mrinal41298-orange)
diff --git a/contribution.txt b/contribution.txt
new file mode 100644
index 0000000..a1ac44a
--- /dev/null
+++ b/contribution.txt
@@ -0,0 +1 @@
+Gurdev Singh: Add dark mode to the project.
diff --git a/main.py b/main.py
new file mode 100644
index 0000000..3c82425
--- /dev/null
+++ b/main.py
@@ -0,0 +1 @@
+# Triggering workflow again