frontend
delt the mergte
fixed uplaod to heroku problem