made edits
fixed merge conflic
WOOHOO MOTHERFUCKERS