Resolve merge conflicts

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)

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)

selenium-tests/SampleTest.java

@@ -0,0 +1 @@
+public class SampleTest {}

selenium-tests/TestBase.java

@@ -0,0 +1 @@
+public class TestBase {}

sonar-project.properties

@@ -0,0 +1,2 @@
+sonar.projectKey=sample
+sonar.sources=.