how were armed conflicts regulated before 1864?