Stash merge
Commented out wfile writes for master's server