Update Aorist Indicative Active.
Update json.
Fixed merge conflicts.