Remove trash from conflict