Index: uspace/lib/posix/unistd.c
===================================================================
--- uspace/lib/posix/unistd.c	(revision df217a60e9e80dbb838631098d7babbacb1554ba)
+++ uspace/lib/posix/unistd.c	(revision c62f2d0b67269b065b7ba128b6de649871b0be11)
@@ -89,11 +89,6 @@
 {
 	/* Always returns false, because there is no easy way to find
-<<<<<<< TREE
      * out under HelenOS. */
 	return 0;
-=======
-	 * out under HelenOS. */
-	return false;
->>>>>>> MERGE-SOURCE
 }