diff --git a/Jamrules.common b/Jamrules.common
index e288992cd5..d92882466a 100644
--- a/Jamrules.common
+++ b/Jamrules.common
@@ -116,9 +116,6 @@ actions piecemeal together existing Clean
 {
 	# remove all jam targets
 	$(RM) $(>)
-	# empty bin directory (removing target of other projects)
-    rmdir --ignore-fail-on-non-empty bin/$(BOARD)/$(PROJECT)
-    rmdir --ignore-fail-on-non-empty bin/$(BOARD) 
 }
 
 #
diff --git a/sys/Jamfile b/sys/Jamfile
index 331778e0c9..93181c9d81 100644
--- a/sys/Jamfile
+++ b/sys/Jamfile
@@ -29,11 +29,8 @@ SubDir TOP sys ;
 
 Module swtimer : swtimer.c : hwtimer ;
 Module posix_io : posix_io.c ;
-<<<<<<< HEAD
 Module shell : shell.c : hashtable hash_string ;
 Module ps : ps.c ;
-=======
->>>>>>> 355988f8cfa6d2d86fbdb7993fa6823943ca23c6
 
 Module auto_init : auto_init.c ;