Fix slice error from merge conflict