Ditch safe_update, which is no longer a thing in current mongoengine.
Resolve merge conflicts.