Fix incorrect merge

Summary:
Fix incorrect merge