Fix build issue after merge