resolving conflict junk