didn't save file correctly when cleaning up merge conflicts
didn't save file correctly when cleaning up merge conflicts

criticaljuncture/calendar_helper,topfunky/calendar_helper,samgranieri/calendar_helper,topfunky/calendar_helper,criticaljuncture/calendar_helper,samgranieri/calendar_helper