fix build errors due to merge