Resolve conflicts by integrating changes from both sides.
Resolve conflicts in Utilities/cmlibarchive/CMakeLists.txt as appropriate.