Fix mismerges of version directives.
2 files changed