[3](Dan, Steve)Added error message for invalid user
merge