resolve conflicts #5257

	name: Test

	on:
	- push
	- pull_request

	jobs:
	test:
	runs-on: ubuntu-22.04
	services:
	redis:
	image: redis:6.2.12-alpine3.18
	# Set health checks to wait until redis has started
	options: >-
	--health-cmd "redis-cli ping"
	--health-interval 10s
	--health-timeout 5s
	--health-retries 5
	ports:
	- 6379:6379
	steps:
	- uses: actions/checkout@v4

	- uses: actions/setup-go@v4
	with:
	go-version-file: go.mod
	cache-dependency-path: go.sum

	- name: Run tests
	run: make ci-test

	- name: Upload coverage to Codecov
	run: bash <(curl -s https://codecov.io/bash)

Provide feedback