Merge proposals

restart-emacs in Ubuntu has no merge proposals.