diff --git a/TTY.dcl b/TTY.dcl
index adc352e28d48bc79cba9b3d8856f7fe188c766f7..4bd19dba829ecba3432176e342f114f902fdb432 100644
--- a/TTY.dcl
+++ b/TTY.dcl
@@ -93,7 +93,6 @@ TTYread :: !*TTY -> (!Int, !*TTY)
  * @result new tty handle
  */
 TTYreadline :: !*TTY -> (!String, !*TTY)
-<<<<<<< HEAD
 
 /**
 * Checks if the TTY device is available for reading