Porting to updated ludoDB
Fixed conflict