Jenkinsfile merge=ours 
Dockerfile merge=ours