resolve conflicting emacs package updates.
fix conflicting branches master and next