admin email implemented
conflict removed