merge python changes