The following file could not be merged automatically: /etc/mtree/BSD.debug.dist Press Enter to edit this file in vi and resolve the conflicts manually... # # Please see the file src/etc/mtree/README before making changes to this file. # /set type=dir uname=root gname=wheel mode=0755 . debug bin .. boot kernel .. modules .. .. lib geom .. nvmecontrol .. .. libexec .. sbin .. usr bin .. lib clang <<<<<<< current version 13.0.0 ======= 16 >>>>>>> 14.0-RELEASE