fix conflicts

source/import_documentation/Components/Solid-Ac-Checker.rst

source/import_documentation/Components/Solid-Auth.rst

source/import_documentation/Components/Solid-Calendar.rst

source/import_documentation/Components/Solid-Delete.rst

source/import_documentation/Components/Solid-Display.rst

source/import_documentation/Components/Solid-Form-Search.rst

source/import_documentation/Components/Solid-Form.rst

source/import_documentation/Components/Solid-Lang.rst

source/import_documentation/Components/Solid-Map.rst

source/import_documentation/Components/Solid-Router.rst

source/import_documentation/Components/Solid-Widget.rst

...ort_documentation/Developping-with-SibTemplateElement.rst

..._documentation/Developping-without-SibTemplateElement.rst

source/import_documentation/Events.rst

source/import_documentation/Helpers-functions.rst

source/import_documentation/How-to-make-components.rst

source/import_documentation/Mixins/counter-mixin.rst

source/import_documentation/Mixins/federation-mixin.rst

source/import_documentation/Mixins/filter-mixin.rst

source/import_documentation/Mixins/grouper-mixin.rst