reports implemented
conflict removed