diff --git a/package/lean/luci-app-haproxy-tcp/Makefile b/package/lean/luci-app-haproxy-tcp/Makefile
old mode 100755
new mode 100644
index a4a24bccf1..0be02c1614
--- a/package/lean/luci-app-haproxy-tcp/Makefile
+++ b/package/lean/luci-app-haproxy-tcp/Makefile
@@ -13,26 +13,7 @@ PKG_VERSION=1.4
 PKG_RELEASE:=2
 PKG_MAINTAINER:=Alex Zhuo <1886090@gmail.com>
 
-<<<<<<< HEAD
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/$(PKG_NAME)
-	SECTION:=luci
-	CATEGORY:=LuCI
-	SUBMENU:=3. Applications
-	TITLE:=luci for haproxy and shadowsocks
-	PKGARCH:=all
-	DEPENDS:=+haproxy
-endef
-
-define Package/$(PKG_NAME)/description
-    A luci app for haproxy with shadowsocks
-endef
-=======
 include $(TOPDIR)/feeds/luci/luci.mk
->>>>>>> 4ed39c663b23fd6db361676004d413bcf2184c45
 
 define Package/$(PKG_NAME)/postinst
 #!/bin/sh
diff --git a/package/lean/qt5/Makefile b/package/lean/qt5/Makefile
index 7601a198fb..2bdc02b52a 100644
--- a/package/lean/qt5/Makefile
+++ b/package/lean/qt5/Makefile
@@ -9,15 +9,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=qt5
-<<<<<<< HEAD
 PKG_VERSION:=5.13
 PKG_RELEASE:=1
 PKG_MD5SUM:=d66b1da335d0c25325fdf493e9044c38
-=======
-PKG_VERSION:=5.8
-PKG_RELEASE:=1
-PKG_MD5SUM:=a9f2494f75f966e2f22358ec367d8f41
->>>>>>> 4ed39c663b23fd6db361676004d413bcf2184c45
 
 PKG_SOURCE:=qt-everywhere-src-$(PKG_VERSION).$(PKG_RELEASE).tar.xz
 PKG_SOURCE_URL:=http://download.qt-project.org/archive/qt/$(PKG_VERSION)/$(PKG_VERSION).$(PKG_RELEASE)/single