merge 'conflict'
merge 'conflict'

Seems like there aren't any hippie edits, rip anyone who didn't read the contributing guide because I just used tg's code
McBawbaggings/HippieStation,McBawbaggings/HippieStation,McBawbaggings/HippieStation,McBawbaggings/HippieStation,McBawbaggings/HippieStation,McBawbaggings/HippieStation,McBawbaggings/HippieStation,McBawbaggings/HippieStation