heroku test
.
fixed merge
cleaned assest