Merge branch 'jc/remove-treesame-parent-in-simplify-merges'