reflects the merge change in dist