These are not merge conflicts. When you run etcupdate on NetBSD, the tool will diff your current /etc contents against the new versions shipped in the source t

These are not merge conflicts. When you run etcupdate on NetBSD, the tool will diff your current /etc contents against the new versions shipped in the source tree or in the etc.txz distribution file -- and it will ask you to manually review every difference. It doesn't matter if you have edited a file /etc by hand or not. If the currently-installed file differs from the new version in any way, you'll be asked about it.