rebase resulted in dual inclusion of function declaration, fix it