fix build post-merge