# Conflicts:
#	common/natsutil.go
#	common/setup/nats_setup.go
#	go.sum
#	integration/shar/messaging_test.go
#	integration/shar/telemetry_function_test.go
#	server/cmd/shar/main.go
#	server/server/server.go
#	server/services/storage/nats.go