Fix conflict with deck stash