diff --git a/challengers-list.md b/challengers-list.md
index 2fb6f60ea..3f93021f8 100644
--- a/challengers-list.md
+++ b/challengers-list.md
@@ -1,4 +1,5 @@
 # List of challengers
 1. [Mrinal](https://github.com/mrinal1224)
 2. [Shivay](https://github.com/shivaylamba)
-3. [Raghav](https://github.com/raghavdhingra)
+3. [Aman](https://github.com/sid-am-ahd935)
+4. [Raghav](https://github.com/raghavdhingra)
diff --git a/contributors/sid-am-ahd935/demo_code.py b/contributors/sid-am-ahd935/demo_code.py
new file mode 100644
index 000000000..2f9a147db
--- /dev/null
+++ b/contributors/sid-am-ahd935/demo_code.py
@@ -0,0 +1 @@
+print("Hello")
diff --git a/contributors/sid-am-ahd935/sid-am-ahd935.md b/contributors/sid-am-ahd935/sid-am-ahd935.md
new file mode 100644
index 000000000..001074959
--- /dev/null
+++ b/contributors/sid-am-ahd935/sid-am-ahd935.md
@@ -0,0 +1,7 @@
+---
+name: Aman Ahmed Siddiqui
+github_user_name: sid-am-ahd935
+url_of_github_issue: https://github.com/scaleracademy/scaler-september-open-source-challenge/issues/265
+your_favourite_programming_language: Python
+
+---
diff --git a/merge-test/merge.txt b/merge-test/merge.txt
new file mode 100644
index 000000000..c695bc735
--- /dev/null
+++ b/merge-test/merge.txt
@@ -0,0 +1,3 @@
+initial content
+adding new contents to original content
+changing contents of merge.txt entirely for conflict