removing .pyc
merge conflicts resolved