Merge branch 'master' into test

.gitattribute

@@ -0,0 +1 @@
+Jenkinsfile merge=ours

Jenkinsfile

@@ -1,10 +1,19 @@
 pipeline {
-    agent { dockerfile true }
-    stages {
-        stage('test') {
+	agent { dockerfile true }
+	stages {
+		stage('run') {
+			steps {
+                when {
+                    branch 'master'
+                }
+				sh 'composer'
+			}
             steps {
+                when {
+                    branch 'test'
+                }
                 sh 'composer --version'
             }
-        }
-    }
-}
+		}
+	}
+}

file_need_to_merge

@@ -0,0 +1 @@
+abcd