Update function-declarations.html

Fixed typo.
fixed merge conflict