; Remove superfluous merge from emacs-25