diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 407fa5e..86cc623 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -1,9 +1,11 @@
 name: Test Suite
 
 on:
+  pull_request:
+    branches:
+      - main
   push:
     branches:
-      - feature/auto-testing
       - main
 
 jobs:
diff --git a/.gitignore b/.gitignore
index 02c21fb..13dfa36 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,2 @@
 .env
-node_modules/
-Dockerfile
-docker-compose.yml
\ No newline at end of file
+node_modules/
\ No newline at end of file
diff --git a/python-recipes/RAG/03_llamaindex.ipynb b/python-recipes/RAG/03_llamaindex.ipynb
index 5e7ec3b..5cb103f 100644
--- a/python-recipes/RAG/03_llamaindex.ipynb
+++ b/python-recipes/RAG/03_llamaindex.ipynb
@@ -89,10 +89,7 @@
         }
       ],
       "source": [
-<<<<<<< HEAD
         "# NBVAL_SKIP\n",
-=======
->>>>>>> 83b1bff7940e4bd05b0ce7e3e4c38c2b04b45a95
         "%pip install -U -q llama-index llama-index-vector-stores-redis llama-index-embeddings-cohere llama-index-embeddings-openai"
       ]
     },