diff --git a/.gitattributes b/.gitattributes
deleted file mode 100644
index 2986db56..00000000
--- a/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-.travis.yml merge=keep-ours
diff --git a/.travis.yml b/.travis.yml
index d7621c8d..02121786 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,6 +17,6 @@ addons:
     notification_email: victor.zverovich@gmail.com
     build_command_prepend: cmake .
     build_command: make -j4
-    branch_pattern: coverity_scan
+    branch_pattern: coverity
 
 script: true