messy merging after I worked on our blog by mistake during class