diff --git a/SOURCES/make-git-snapshot.sh b/SOURCES/make-git-snapshot.sh
index ba7ce4c..64a5bec 100755
--- a/SOURCES/make-git-snapshot.sh
+++ b/SOURCES/make-git-snapshot.sh
@@ -3,16 +3,10 @@
 proto=$1
 branch=$2
 
-<<<<<<< HEAD
-DIRNAME=xf86-video-nouveau-$( date +%Y%m%d )
-||||||| merged common ancestors
-DIRNAME=libdrm-$( date +%Y%m%d )
-=======
 if [ -z "$proto" ]; then
     echo "Usage: $0 <proto name> [<branch>]"
     exit 1
 fi
->>>>>>> xorg-x11-proto-devel package update
 
 dirname=$proto-$( date +%Y%m%d )
 
@@ -28,23 +22,6 @@ sha=`git rev-list --max-count=1 --abbrev-commit HEAD`
 git repack -a -d
 cd ..
 
-<<<<<<< HEAD
-git clone ${REF:+--reference $REF} \
-	git://git.freedesktop.org/git/nouveau/xf86-video-nouveau $DIRNAME
-
-GIT_DIR=$DIRNAME/.git git archive --format=tar --prefix=$DIRNAME/ ${1:-HEAD} \
-	| xz > $DIRNAME.tar.xz
-
-# rm -rf $DIRNAME
-||||||| merged common ancestors
-git clone ${REF:+--reference $REF} \
-	git://git.freedesktop.org/git/mesa/drm $DIRNAME
-
-GIT_DIR=$DIRNAME/.git git archive --format=tar --prefix=$DIRNAME/ ${1:-HEAD} \
-	| bzip2 > $DIRNAME.tar.bz2
-
-# rm -rf $DIRNAME
-=======
 # append sha to dirname
 mv $dirname $dirname-git$sha
 dirname=$dirname-git$sha
@@ -52,4 +29,3 @@ tarball=$dirname.tar.bz2
 tar jcf $tarball $dirname
 rm -rf $dirname
 echo "$tarball is now available"
->>>>>>> xorg-x11-proto-devel package update