diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
index 716c1094c0e..f197f11de3b 100644
--- a/.github/workflows/pr.yaml
+++ b/.github/workflows/pr.yaml
@@ -68,34 +68,15 @@ jobs:
         steps:
             - name: get the code
               uses: actions/checkout@v6
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> 01b0cd1 (added changes to dev)
             - name: Set up Docker Buildx
               uses: docker/setup-buildx-action@v4
             - name: build docker image
               uses: docker/build-push-action@v7
-<<<<<<< HEAD
               with:
                 push: false
                 tags: "shaik2025/springpetclinic:latest"          
-=======
-            - name: compile the code
-              run: mvn compile
-            - name: test the code
-              run: mvn test
-            - name: create the package
-              run: mvn clean package
-            - name: publish the test results
-              uses: EnricoMi/publish-unit-test-result-action@v2
-              with:
-                files: "**/target/surefire-reports/**/*.xml"
-                comment_mode: always
->>>>>>> 2a5ec96 (added files)
-=======
+              run: mvn clean package         
               with:
                 push: false
                 tags: "shaik2025/springpetclinic:latest"
 
->>>>>>> 01b0cd1 (added changes to dev)
diff --git a/file1.txt b/file1.txt
new file mode 100644
index 00000000000..3e8d2ce7c59
--- /dev/null
+++ b/file1.txt
@@ -0,0 +1 @@
+ertyuio
\ No newline at end of file