stash Peer tweaks
merge