diff --git a/owmx-3.0/skin.properties b/owmx-3.0/skin.properties
index a7f7147..482b618 100644
--- a/owmx-3.0/skin.properties
+++ b/owmx-3.0/skin.properties
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 #
 # Copyright (C) 2011, B3log Team
 #
@@ -23,4 +24,4 @@
 name=owmx-3.0
 version=2.0.5
 forSolo=0.6.0
-memo=Refers to http://lightdian.b3log.org
\ No newline at end of file
+memo=Refers to http://lightdian.b3log.org