fix build issue created during environment merge