diff --git a/package/lean/frp/Makefile b/package/lean/frp/Makefile
index b64857e0f2..9edbb19e19 100644
--- a/package/lean/frp/Makefile
+++ b/package/lean/frp/Makefile
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 #
 # Copyright (C) 2019 Xingwang Liao
 #
@@ -53,10 +52,10 @@ define frp/templates
   define Package/$(1)/install
 	$$(call GoPackage/Package/Install/Bin,$$(PKG_INSTALL_DIR))
 
-	$(STAGING_DIR_HOST)/bin/upx --lzma --best $(PKG_INSTALL_DIR)/usr/bin/$(1)
-
 	$$(INSTALL_DIR) $$(1)/usr/bin
 	$$(INSTALL_BIN) $$(PKG_INSTALL_DIR)/usr/bin/$(1) $$(1)/usr/bin/
+
+	$(STAGING_DIR_HOST)/bin/upx --lzma --best $$(1)/usr/bin/$(1)
   endef
 endef
 
@@ -67,73 +66,3 @@ $(foreach component,$(FRP_COMPONENTS), \
   $(eval $(call GoBinPackage,$(component))) \
   $(eval $(call BuildPackage,$(component))) \
 )
-=======
-#
-# Copyright (C) 2019 Xingwang Liao
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=frp
-PKG_VERSION:=0.31.2
-PKG_RELEASE:=2
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=https://codeload.github.com/fatedier/frp/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=790a18f5651cc645a3d73fc147c719f5b212fc21db0c51c620011ee836b7a28f
-
-PKG_LICENSE:=Apache-2.0
-PKG_LICENSE_FILES:=LICENSE
-PKG_MAINTAINER:=Xingwang Liao <kuoruan@gmail.com>
-
-PKG_BUILD_DEPENDS:=golang/host
-PKG_BUILD_PARALLEL:=1
-PKG_USE_MIPS16:=0
-
-GO_PKG:=github.com/fatedier/frp
-GO_PKG_BUILD_PKG:=github.com/fatedier/frp/cmd/...
-
-GO_PKG_LDFLAGS:=-s -w
-
-include $(INCLUDE_DIR)/package.mk
-include $(TOPDIR)/feeds/packages/lang/golang/golang-package.mk
-
-define frp/templates
-  define Package/$(1)
-    TITLE:=A fast reverse proxy ($(1))
-    URL:=https://github.com/fatedier/frp
-    SECTION:=net
-    CATEGORY:=Network
-    SUBMENU:=Web Servers/Proxies
-    DEPENDS:=$$(GO_ARCH_DEPENDS)
-  endef
-
-  define Package/$(1)/description
-  frp is a fast reverse proxy to help you expose a local server behind a NAT or firewall
-  to the internet. As of now, it supports tcp & udp, as well as http and https protocols,
-  where requests can be forwarded to internal services by domain name.
-
-  This package contains the $(1).
-  endef
-
-  define Package/$(1)/install
-	$$(call GoPackage/Package/Install/Bin,$$(PKG_INSTALL_DIR))
-
-	$$(INSTALL_DIR) $$(1)/usr/bin
-	$$(INSTALL_BIN) $$(PKG_INSTALL_DIR)/usr/bin/$(1) $$(1)/usr/bin/
-	
-	$(STAGING_DIR_HOST)/bin/upx --lzma --best $$(1)/usr/bin/$(1)
-  endef
-endef
-
-FRP_COMPONENTS:=frpc frps
-
-$(foreach component,$(FRP_COMPONENTS), \
-  $(eval $(call frp/templates,$(component))) \
-  $(eval $(call GoBinPackage,$(component))) \
-  $(eval $(call BuildPackage,$(component))) \
-)
->>>>>>> 252c766ae3fcf52e1610d534056f17d556ec3c99