changed names of function name conflict.
Merge branch 'master' of github.com:pravee-n/fuzzy-octo-bear