resolve tree conflict