diff --git a/02-Services/00-creds/api keys.md b/02-Services/00-creds/api keys.md
index 73e49c5..0337d9e 100644
--- a/02-Services/00-creds/api keys.md	
+++ b/02-Services/00-creds/api keys.md	
@@ -76,7 +76,3 @@ DRIVE_API_KEY=AIzaSyAB5mry4SGDb1bmNGLGZ4bmDPXAUai6HPs
 ```
 # redacted_key=dd82a2d1.dea25477e9f42304959b6c3c7b08f880
 ```
-
-=======
-```
->>>>>>> refs/remotes/origin/master