fix build after merge
1 file changed