fix conflicts

.env.test

@@ -0,0 +1,4 @@
+NODE_ENV=development
+BASE_URL=https://test.better-call.dev/
+VUE_APP_API_URI=https://test.better-call.dev/v1
+VUE_APP_WS_URI=wss://test.better-call.dev/v1/ws

Makefile

@@ -7,6 +7,9 @@ dev:
 you:
 	npm run serve -- --mode you
 
+test:
+	npm run serve -- --mode test
+
 image:
 	docker build -t bakingbad/bcdhub-gui:latest .
 
@@ -15,5 +18,4 @@ stable-image:
 	docker build -t bakingbad/bcdhub-gui:$$STABLE_TAG .
 
 release:
-	BCD_VERSION=$$(cat package.json | grep version | awk -F\" '{ print $$4 }')
-	git tag $$BCD_VERSION && git push origin $$BCD_VERSION
+	BCD_VERSION=$$(cat package.json | grep version | awk -F\" '{ print $$4 }') && git tag $$BCD_VERSION && git push origin $$BCD_VERSION