diff --git a/doc/api/readline.markdown b/doc/api/readline.markdown
index 398012160c5..66615485a21 100644
--- a/doc/api/readline.markdown
+++ b/doc/api/readline.markdown
@@ -52,12 +52,9 @@ Sets the prompt, for example when you run `node` on the command line, you see
 Readies readline for input from the user, putting the current `setPrompt`
 options on a new line, giving the user a new spot to write.
 
-<<<<<<< HEAD
 This will also resume the `in` stream used with `createInterface` if it has
 been paused.
 
-=======
->>>>>>> ry/v0.6
 ### rl.question(query, callback)
 
 Prepends the prompt with `query` and invokes `callback` with the user's