Forward fix merge conflict (#69319)
Summary:
Forward fixes a merge conflict between two commits
Pull Request resolved: https://github.com/pytorch/pytorch/pull/69319
Reviewed By: seemethere
Differential Revision: D32810884
Pulled By: janeyx99
fbshipit-source-id: 6e2f9fc89d00da979de1430a172673e82c51ba14
