Try not to push app.js to the commits. It creates unneeded conflicts.