saving progress on master
Fix merge conflict in .pyc files
post-removing pyc files?
wtf is happening seriously