Fixed merge conflict in mongo.py