trying a few things in Python
fixing merge