confflict file fix.
	new file:   browse-kill-ring.el