Remove function from incorrect merge resolve
Merge pull request #9 from cimaron/master

Remove function from incorrect merge resolve