FreeBSD 10.0 and newer include etcupdate (and it has been available as port even longer) which improves a lot upon mergemaster through the use of 3way instead of 2way merges. Recent releases also added ways to keep most of your config in your own files (often included from /usr/local/etc) to avoid merge conflicts. Simple systems can often upgrade without any merge conflicts at all.