# Conflicts: # frontend/src/views/home/components/compareTestPopup.vue # frontend/src/views/home/components/testPopup.vue