diff --git a/lib/questionlib.php b/lib/questionlib.php
index b4b311ec861..0823db1f46a 100644
--- a/lib/questionlib.php
+++ b/lib/questionlib.php
@@ -10,11 +10,7 @@
  * TODO: separate those functions which form part of the API
  *       from the helper functions.
  *
-<<<<<<< questionlib.php
  * @version $Id$
-=======
- * @version $Id$
->>>>>>> 1.72.2.6
  * @author Martin Dougiamas and many others. This has recently been completely
  *         rewritten by Alex Smith, Julian Sedding and Gustav Delius as part of
  *         the Serving Mathematics project