fix sutff that disappear in the merge