fixing missed issue from merge conflict