Remove junk from conflict