Manziel reaches deal in assault case