(fix) fixes today's heinous merge conflicts