- Add CONFLICTS - Trim Makefile headers PR: 178161 Submitted by: Matthias Petermann <matthias@petermann.it> (maintainer)