removed accidentally included conflict junk