Correcting a bad merge
documentation for functions.