fix(changelog): merge conflict

5 jobs for 96-add-route-to-header in 1 minute and 25 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Lint
passed #1080636
docker
lint

00:00:31

 
  Build
passed #1080637
shell
build

00:00:26

 
  Test
passed #1080638
shell
test

00:00:11

passed #1080639
shell
test-js

00:00:19

 
  Tag Docker
passed #1080640
shell
tag_docker

00:00:07