oops, missed that in the merge resolution