Resolve merge conflict

etc/kayobe/inventory/group_vars/compute/firewall

etc/kayobe/inventory/group_vars/controllers/firewall

etc/kayobe/kolla.yml

etc/kayobe/kolla/config/cinder/cinder-backup.conf

...der/cinder-backup/ceph.client.arcus-cinder-backup.keyring

...fig/cinder/cinder-backup/ceph.client.arcus-cinder.keyring

etc/kayobe/kolla/config/cinder/cinder-backup/ceph.conf

etc/kayobe/kolla/config/cinder/cinder-volume.conf

...fig/cinder/cinder-volume/ceph.client.arcus-cinder.keyring

etc/kayobe/kolla/config/cinder/cinder-volume/ceph.conf

etc/kayobe/kolla/config/nova/ceph.client.cinder.keyring

etc/kayobe/kolla/config/nova/ceph.conf

etc/kayobe/kolla/globals.yml

etc/kayobe/secrets.yml