- use six.exec_
- don't encode on Py3
- cleanup conflict resolution mess