heroku
add assets
fix conflict