Remove left over merge code