Fix ActivityService broken on merge

Fix ActivityService broken on merge