Fix conflict in upperio/service.go