add app.pyc file
fix merge conflict