Conflict junk removed