conflict japonia