upto userServiceTest all work done
conflict removed