fix erro during merge

Summary:
as title

Test Plan:
make release