diff --git a/less/account.less b/less/account.less
index 41e5d56..7d5a30c 100644
--- a/less/account.less
+++ b/less/account.less
@@ -224,8 +224,6 @@
 	}
 }
 
-<<<<<<< HEAD
-=======
 .picture-switcher {
 	img, .user-icon {
 		.user-icon-style(46px, 2.4rem, 50%);
@@ -235,5 +233,4 @@
 		line-height: 46px;
 		margin: 0;
 	}
-}
->>>>>>> master
+}
\ No newline at end of file