Fix issue from a merge