Same here - had the problem, solved it by deleting the imported 1099-B and creating a new one manually. Luckily, I only had two transactions post merger (the pre-merger Etrade 1099-B is fine).
