code complete
conflict fixed