Merge "delete .service.yaml.swp"