Python: Fixed rebase conflicts.