Merge changes from parent.