# Conflicts:
#	.gitlab-ci.yml
#	docker/World.zone.xml
#	license/se/license.txt
#	restful/README.md
#	restful/TestDockerfile
#	restful/pom.xml
#	restful/src/main/java/server/restful/service/SimulatorService.java
#	restful/src/main/java/server/restful/service/VehicleService.java
#	restful/src/test/java/server/restful/service/MapServiceTest.java
#	restful/src/test/java/server/restful/service/NavigationServiceTest.java
#	restful/src/test/java/server/restful/service/VehicleServiceTest.java
#	restful/src/test/java/server/restful/service/WorldBuilderServiceTest.java
#	rpc/README.md
#	rpc/pom.xml
#	rpc/src/main/java/server/rpc/SimulationControllerImpl.java
#	rpc/src/main/java/server/rpc/SimulationObserver.java
#	rpc/src/main/proto/simulationController.proto