*.pyc remove
fix conflict