README.md

@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-# yt-dlp-stream-to-s3
-
-=======
-## yt-dlp stream to s3
+# yt-dlp stream to s3
 
 Small utility to download a file using yt-dlp and stream directly to s3. Avoids saving the file on disk.
 
@@ -23,5 +19,4 @@ try:
     yt_dlp_stream_to_s3(URL, s3_extra_args=dict(ACL="public-read"))
 except Exception as e:
     print("error", e)
-```
->>>>>>> d2b1e5d (first commit)
+```