diff --git a/muffin/muffin.SlackBuild b/muffin/muffin.SlackBuild
index 4284dcf..4bb4063 100644
--- a/muffin/muffin.SlackBuild
+++ b/muffin/muffin.SlackBuild
@@ -71,11 +71,8 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-<<<<<<< HEAD
 sed -i "s|--warn-error||g" src/Makefile.am
-=======
 patch -p1 < $CWD/0001-fix-warnings-when-compiling.patch
->>>>>>> muffin: Build fix.
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \