Merge remote and new local TrClTree