Merge parent changes