merger tree fixes