diff --git a/readme.win_cb b/readme.win_cb
index c19269c26a3..8d8bf6772b2 100644
--- a/readme.win_cb
+++ b/readme.win_cb
@@ -36,7 +36,7 @@ choose the "project", ie, imageSaverExample as opposed to the openframeworks lib
 
 
 
-2) if you want to make a new project:
+3) if you want to make a new project:
 --------------------------------------------------------------------------------
 
 a) copy the folder inside of apps and paste in the same directory
@@ -45,30 +45,15 @@ ie (copy "emptyExample" and paste "copy of emptyExample")
 
 b) rename the folder, and inside the folder, rename the .cbp and .workspace
 
-<<<<<<< HEAD
-c) open the .cbp file with a text editor.  change the occurances of the old name to the new name:
-
-line 5: <Option title="emptyExample" />
-line 11: <Option output="bin\emptyExample" prefix_auto="1" extension_auto="1" />
-line 18: <Option output="bin\emptyExample_DEBUG" prefix_auto="1" extension_auto="1" />
-=======
 c) open the .cbp file with a text editor.  Change the occurance of the old name to the new name:
 
 line 5: <Option title="emptyExample" />
->>>>>>> d832d224208f805f67c15d0f030d0f75bee33647
 
 for example, if I copied emptyexample and wanted to call it "coolExample" would look like:
 
 line 5: <Option title="coolExample" />
-<<<<<<< HEAD
-line 11: <Option output="bin\coolExample" prefix_auto="1" extension_auto="1" />
-line 18: <Option output="bin\coolExample_DEBUG" prefix_auto="1" extension_auto="1" />
-
-in the solution file, change the name of .cbp file:
-=======
 
 in the workspace file, change the name of .cbp file:
->>>>>>> d832d224208f805f67c15d0f030d0f75bee33647
 
 line 4: <Project filename="emptyExample.cbp" active="1" />
 
@@ -76,6 +61,14 @@ to whatever you've renamed the cbp to.
 
 
 
+4) codeblocks wizard
+--------------------------------------------------------------------------------
+
+From 007 there's a codeblocks wizard to create projects, you can find instructions
+on how to install it in scripts/win_cb/codeblocks_wizard.
+	
+	
+
 
 as always if you have issues, check or post on the forum:  openframeworks.cc/forum