fix: remove merge relict