diff --git a/scumm/string.cpp b/scumm/string.cpp
index 5f39617eee5..dee0c92e544 100644
--- a/scumm/string.cpp
+++ b/scumm/string.cpp
@@ -16,11 +16,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *
-<<<<<<< string.cpp
  * $Header$
-=======
- * $Header$
->>>>>>> 1.153
  *
  */