Fixed an issue which caused tree metadata id to be lost when resolving conflicts.