some conflict anaysis code... not much too see yet... - View it on GitHub