diff --git a/static/scripts/sunloginclient-fixup.sh b/static/scripts/sunloginclient-fixup.sh
index 5c10eef..e0a1da2 100644
--- a/static/scripts/sunloginclient-fixup.sh
+++ b/static/scripts/sunloginclient-fixup.sh
@@ -10,9 +10,5 @@ cp -v /usr/local/sunlogin/scripts/runsunloginclient.service \
     /etc/systemd/system/runsunloginclient.service
 systemctl enable runsunloginclient.service --now
 
-<<<<<<< HEAD
-echo "正在修正皮肤权限位 ..."
-=======
 echo "正在修正皮肤数据包权限位 ..."
->>>>>>> 0eadd18 (feat(scripts): add fix up script for sunloginclient)
 chmod 666 /usr/local/sunlogin/res/skin/*