fixed: conflict undohist.el