align upstream

Makefile

@@ -63,7 +63,6 @@ clean-dev:
 	rm -rf node_modules
 
 composer:
-<<<<<<< HEAD
 	composer install --prefer-dist --ignore-platform-req=ext-gd
 	composer update --prefer-dist --ignore-platform-req=ext-gd
 
@@ -85,16 +84,11 @@ github-upload:
 		--tag v$(version) \
 		--name "$(app_name)-$(version).tar.gz" \
 		--file $(build_dir)/$(app_name)-$(version).tar.gz
-=======
-	composer install --prefer-dist --no-dev
-	composer upgrade --prefer-dist --no-dev
 
 composer-dev:
 	composer install --prefer-dist --dev
 	composer upgrade --prefer-dist --dev
 
-release: appstore
->>>>>>> 72be81700039485ac4ef71fecd62eee969bc4a91
 
 # creating .tar.gz + signature
 appstore: dev-setup lint build-js-production composer