docs: split out avoiding conflicts section #13167
+35
−19
Merged
Loading