conflicts due to radically different approaches to security and bug fixes. In some cases I re-started from the vendor version and reimplemented our patches. Fortunately, this is not enabled by default in -current.
