diff --git a/mkvtoolnix/.md5sum b/mkvtoolnix/.md5sum
index 94c5d3d83..95608b0ae 100644
--- a/mkvtoolnix/.md5sum
+++ b/mkvtoolnix/.md5sum
@@ -1 +1,5 @@
+<<<<<<< Updated upstream:mkvtoolnix/.md5sum
 de0b41f0dc9b3c7c59a23be4b6e3ee46  mkvtoolnix-2.5.3.tar.bz2
+=======
+034e6c4a11b4a9536d250a309c16be85  mkvtoolnix-2.6.0.tar.bz2
+>>>>>>> Stashed changes:mkvtoolnix/.md5sum
diff --git a/mkvtoolnix/Pkgfile b/mkvtoolnix/Pkgfile
index f6aa6d669..0700720fd 100644
--- a/mkvtoolnix/Pkgfile
+++ b/mkvtoolnix/Pkgfile
@@ -5,7 +5,11 @@
 # Depends on: libmatroska libvorbis boost
 
 name=mkvtoolnix
+<<<<<<< Updated upstream:mkvtoolnix/Pkgfile
 version=2.5.3
+=======
+version=2.6.0
+>>>>>>> Stashed changes:mkvtoolnix/Pkgfile
 release=1
 source=(http://www.bunkus.org/videotools/mkvtoolnix/sources/$name-$version.tar.bz2)