[wip] unstashing files
deletes old cache files
[wip] recovers lost work from stash
[misc] commits stashed files -- cleaning up stash
cleans up missed merge conflict in banner partial