updated scrounge.el
resolved merge conflict in scrounge.el