fixed the fuck out of that conflict