Resolved conflict - added max prune