Add line Z in file4

In this pull request, the master branch is merged into the pull-requesting branch to resolve conflict.