fix a conflict in the merge from rusty