backend and front end synced
Fixing merge conflicts