Bring back merging of divergent entries#2121

Merged

MarcinAman merged 1 commit intomasterfrom fix-stdlib-mergin

Sep 8, 2021

+2-1

Commits on Sep 7, 2021

Bring back mergin of divergent entries
MarcinAman
committed