Added function support
merge
fixed merge