chg clone
resolved conflict app.js