https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=246647 --- Comment #13 from Peter Grehan <grehan at FreeBSD.org> --- The conflicts can simply resolve with a merge/accept yours. -- You are receiving this mail because: You are on the CC list for the bug.