diff --git a/custom.css b/custom.css
index 4a250a5..72fd0a0 100644
--- a/custom.css
+++ b/custom.css
@@ -344,5 +344,3 @@ span.mx_MVideoBody video.mx_MVideoBody {
   box-shadow: unset;
   border-radius: 0;
 }
-=======
->>>>>>> 26529aa77a2fdc33f832f6903982bb6f048c8d18