mathlib3

44625737 - fix merge conflicts in src/algebra/char_p/exp_char.lean