fix stash confict
hox fix