fix build errors after merge