diff --git a/packages/rocketchat-ui-master/server/dynamic-css.js b/packages/rocketchat-ui-master/server/dynamic-css.js
index 2e4ef1b43e1..37acc385bce 100644
--- a/packages/rocketchat-ui-master/server/dynamic-css.js
+++ b/packages/rocketchat-ui-master/server/dynamic-css.js
@@ -150,14 +150,8 @@ export default () => {
 	}, 100);
 
 	DynamicCss = typeof DynamicCss !=='undefined'? DynamicCss : {};
-<<<<<<< HEAD
 	DynamicCss.test = () => window.CSS && window.CSS.supports && window.CSS.supports('(--foo: red)');
 	DynamicCss.run = debounce((replace = false) => {
-
-
-=======
-	DynamicCss.run = debounce((replace = false) => {
->>>>>>> 2aa991faeef52dd99e3e0bdde1aa04f5b0d110f7
 		if (replace) {
 			document.querySelector('#css-variables').innerHTML = RocketChat.settings.get('theme-custom-variables');
 		}