diff --git a/.gitattributes b/.gitattributes
index 6d99763..3c8fdee 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1,2 @@
 Jenkinsfile merge=ours 
+Dockerfile merge=ours