Fixed an error

Fixed an error introduced by a merge conflict