[405274] - StackOverFlow error when merging a diff