commit changes in frontend and backend jump off the roof
fixed merge conflicts