resolved merge problems with staging

core/fixtures/exercise_fixtures.json

core/migrations/0015_merge_20230519_0038.py

..._topgym_user_first_name_topgym_user_last_name_and_more.py

core/templates/algorithm.html

core/templates/base.html

core/templates/make-routine.html

core/templates/map.html

core/templates/survey.html

core/tests.py

core/urls.py

core/views.py