evolve: fix bug in public content divergence merging logic in continue case
requested to merge topic/default/khanchi-bugfix-public-divergence into topic/default/khanchi-cdiv-bugfix
This instance will be upgraded to Heptapod 1.3.3 (GitLab 16.9.6) on 2023-04-25 at 18:00 UTC+2