Fix build from merge