fix build after merge