Fixing build error from merge