diff --git a/Jenkinsfile b/Jenkinsfile
index aa05edb9b..882bb3e9c 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,4 +1,5 @@
 pipeline {
+<<<<<<< HEAD
     
 	agent any
         
@@ -32,10 +33,33 @@ pipeline {
         }
 
 	stage('UNIT TEST'){
+=======
+    agent any
+    stages {
+        stage('Checkout') {
+            steps {
+                git 'https://github.com/example/repo.git'
+            }
+        }
+        stage('Build') {
+            steps {
+                sh 'mvn clean package'
+            }
+        }
+        stage('SonarQube Analysis') {
+            steps {
+                withSonarQubeEnv('SonarQube') {
+                    sh 'mvn sonar:sonar'
+                }
+            }
+        }
+        stage('Selenium Tests') {
+>>>>>>> d416274 (adding new proj repo)
             steps {
                 sh 'mvn test'
             }
         }
+<<<<<<< HEAD
 
 	stage('INTEGRATION TEST'){
             steps {
@@ -120,3 +144,12 @@ pipeline {
 
 
 }
+=======
+        stage('Archive Artifact') {
+            steps {
+                archiveArtifacts artifacts: 'target/*.jar'
+            }
+        }
+    }
+}
+>>>>>>> d416274 (adding new proj repo)
diff --git a/README.md b/README.md
index 48bdade48..83ed53a95 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 # Prerequisites
 #######
 - JDK 11 
@@ -23,3 +24,7 @@ sql dump file:
 - > mysql -u <user_name> -p accounts < db_backup.sql
 
 
+=======
+# CI/CD DevOps Project
+Includes Jenkins, Selenium, SonarQube and Jira integration.
+>>>>>>> d416274 (adding new proj repo)
diff --git a/pipeline_diagram.png b/pipeline_diagram.png
new file mode 100644
index 000000000..80dfdbed0
Binary files /dev/null and b/pipeline_diagram.png differ
diff --git a/selenium-tests/SampleTest.java b/selenium-tests/SampleTest.java
new file mode 100644
index 000000000..1a1641ec2
--- /dev/null
+++ b/selenium-tests/SampleTest.java
@@ -0,0 +1 @@
+public class SampleTest {}
\ No newline at end of file
diff --git a/selenium-tests/TestBase.java b/selenium-tests/TestBase.java
new file mode 100644
index 000000000..525a7da0a
--- /dev/null
+++ b/selenium-tests/TestBase.java
@@ -0,0 +1 @@
+public class TestBase {}
\ No newline at end of file
diff --git a/sonar-project.properties b/sonar-project.properties
new file mode 100644
index 000000000..f9e6a6f7a
--- /dev/null
+++ b/sonar-project.properties
@@ -0,0 +1,2 @@
+sonar.projectKey=sample
+sonar.sources=.
\ No newline at end of file