PeopleInSpace: Fix Manual Merge Conflict Markers