Modified service.py
Resolved conflict