Fix incorrect variable from merge