Fixing python
Fixing merges