Fix ifdef after merge