hotfix merge conflict

(fill in the blanks and add/remove tasks as you see fit)

As a … I want … So that…

Dev tasks

Front-end

• [ ]
• [ ]
• [ ]

Back-end

• [ ]
• [ ]
• [ ]

Acceptance criteria

• [ ]
• [ ]
• [ ]

assigned to @c22051162

closed