Fixed an issue which caused tree metadata id to be lost when resolving conflicts.
Merge remote-tracking branch 'origin/pr/340'