fixing botched binary merge