Fix <<< error from previous merge conflict