Merge "Don't try to remove .repo if it doesn't exist"