correct typing error
The merge conflict had been resolved