The above conflict occurs because only one .conf file should exist - either cb.conf or cb-multhome.conf. This is because the Nginx web server requires only one listen directive, which determines the IP and ports to listen on.
Note: The upgrade will ignore files that do not have a .conf extension. For example, cb.conf.bak
Rename second .conf file - Pre 5.2, only one .conf file should exist in the /etc/cb/nginx/conf.d directory. Determine which file should exist, either cb.conf for a shared UI and Sensor port (default of 443) or cb-multihome.conf for separate UI and Sensor ports.
Keep cb.conf for a shared UI and Sensor port (default of 443):