Title: Tree conflict resolution algorithms: the non-homogeneous case