working on recursion
merge conflict fix