Removed pyc files
Fix merge.