diffs with 09-16
merged stashes