Update file headers.
Resolve merge conflict