fixed errors frontend and backend
merge conflicts
changes any