Merge pull request #5038 from Sliosh/patch-1

Fix small detail about conflicts in overview.rst