remove api key
Fixing Conflicts
fixing conflicts