merge-related fixes and update to plot_tree examples