# freebsd-update -r 11.1-RELEASE upgrade [metadata and patch fetching stuff happens] Attempting to automatically merge changes in files... done. The following file could not be merged automatically: /etc/mtree/BSD.usr.dist It seems like these files should never need manual merging?