fix nancy
merge