changes during raven
fixed conflict
added commented gcode