Adding my function

Fixed merge conflict