Fixed merge conflict on arango/clients/__init__.py