remove pyc files
fix merge