conflicts resolved ( Jeremy + Brad );