migrate to py2
blah migration
conflict resolution