First merge conflict 😭 note to self: do not try to fix it in Gitlab UI the nest time