diff --git a/Dockerfile b/Dockerfile
index 7d2eac8dbfe879df183eefdd4c41c2c473f942f0..99a4b6f8d6b94a0f73257ac508a3e1cea06eb8a0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -35,5 +35,3 @@ ENV DASHBOARD_BASE_URL=http://localhost:4200 \
 	DASHBOARD_CTRL_API_BASE_URL=http://localhost:8085 \
 	BUS_OD_API_BASE_URL=http://localhost:8000/busesod \
 	BIKETRAJECTORY_API_BASE_URL=http://localhost:8000/urbanite_biketrajectories
-
->>>>>>> Dockerfile