[Git][cmucl/cmucl][issue-101-clang-trapping-math] Fix merge conflicts