It doesn't conflict, but it does miss the good opportunity to do the standing to-do item of consolidating those using macros in version.h or someplace such that only one spot of manual patching is required each year.