Testing "make clean" potential for fixing CMakeFiles merge issues...