fixing crap merge