Use the `-s ours` merge strategy to avoid conflicts. Our side was already fixed by commit 8b63265ea5 (FindLAPACK: Unify internal variables related to MKL, 2018-11-18) as part of other work.
Brad King