edit photo files and app.js
fix merge issue