add maximum recursion limit for partial inclusion
conflict merge fix