Update function-declarations.html

Fixed a spelling typo in a comment.
fixed conflict