Nikon-Ti/Nikon-Ti-inverted-epifluorescent-microscope.md

@@ -4,10 +4,6 @@ This Nikon Ti is an in inverted fluorescence microscope which is setup for live
 * Lamp for transmitted light 
 * Temperature controlled incubation chamber with controllable CO_2 
 
-<<<<<<< HEAD
 ![Nikon Ti](./media/Nikon_Ti.jpg)
 
-### [Turning on](./turning-on)
-=======
-* [Turning on](./turning-on)
->>>>>>> bae82f7632cc1be398bd7da4d673ba7fcddba9aa
+### [Turning on](./Turning-on-the-Nikon-Ti-Microscope)