testing view profile
prep for heroku
fixed conflicts