two kinds of recursion
merge conflict