Resolving a merge conflict

doc/sphinx/book/box/index.rst

doc/sphinx/book/box/sophia_diff.rst

doc/sphinx/book/box/triggers.rst

doc/sphinx/book/configuration/cfg-replication.rst

doc/sphinx/book/connectors/__php.rst

doc/sphinx/book/connectors/__results.rst

doc/sphinx/book/index.rst

doc/sphinx/book/replication/index.rst

doc/sphinx/faq.rst

doc/sphinx/reference/crypto.rst

doc/sphinx/reference/digest.rst

doc/sphinx/reference/expirationd.rst

doc/sphinx/reference/fiber-ipc.rst

doc/sphinx/reference/fiber.rst

doc/sphinx/reference/fun.rst

doc/sphinx/reference/msgpack.rst

doc/sphinx/reference/socket.rst

doc/sphinx/reference/tdb.rst

src/CMakeLists.txt

src/fiber.c