fixed case in Service class
test conflict