Merge root changes