fixed weirdness from merge