cleanup
wtf
revert conflicts
ignore pyc