diff --git a/Jenkinsfile b/Jenkinsfile
index b31f8a2..b9ee766 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,17 +1,14 @@
-#!groovy
 
-node {
-    
+
+    >>>>>>> development
        stage('Checkout'){
 
           checkout scm
        }
-
        stage('Compiling'){
 
           sh 'mvn deploy'
-       }
-	   
+       }   
       stage('Sonar') {
                     //add stage sonar
                     sh 'mvn sonar:sonar'
diff --git a/pom.xml b/pom.xml
index 189606b..8908610 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,16 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
+  <modelVersion>4.0.0</modelVersion> 
 
   <groupId>com.kctechnologies</groupId>
   <artifactId>maven-web-project</artifactId>
   <packaging>war</packaging>
-  <version>1.0-SNAPSHOT</version>
+  <version>1.0-SNAPSHOTS</version>
   <name>Maven Web Project</name>
   <description>Maven Web Project for Java</description>
-
-
+	
   <properties>
 	    <spring.version>4.1.4.RELEASE</spring.version>
 		<junit.version>4.11</junit.version>
diff --git a/src/main/a b/src/main/a
new file mode 100644
index 0000000..a6d241e
--- /dev/null
+++ b/src/main/a
@@ -0,0 +1 @@
+hi newday
diff --git a/src/main/java/com/kc/contoller/SampleController.java b/src/main/java/com/kc/contoller/SampleController.java
index a86586d..2793280 100644
--- a/src/main/java/com/kc/contoller/SampleController.java
+++ b/src/main/java/com/kc/contoller/SampleController.java
@@ -11,6 +11,7 @@
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
+
 @RestController
 @RequestMapping("/")
 public class SampleController {
diff --git a/src/main/roster b/src/main/roster
new file mode 100644
index 0000000..3e75765
--- /dev/null
+++ b/src/main/roster
@@ -0,0 +1 @@
+new