Merge

Also having the energy problem. It stops accumulating as soon as I save and exit. This tends to happen when there is a special challenge. So you can't complete the challenge without buying more energy.