readme

README.md

@@ -11,10 +11,5 @@ Nginx is currently used to share my publicly facing services with a subdomain of
 
 ## TODO
 - Investigate a sync service for music playlists between yt spotify musicbrainz and lastfm
-<<<<<<< HEAD
 - find email filtering service to host
 - Check out caddy and try it as an alternitive to nginx
--
-=======
-- Check out caddy and try it as an alternitive to nginx
->>>>>>> main