fixing broken build from merge