remove left over merge goo