resolve conflict

aky15

2023-04-12 dccbcc48a583eb38b4bc5b459d417087826846ac

1
2
3
4
5
6
7
8
9
isa    1
dalawa    2
tatlo    3
apat    4
lima    5
anim    6
pito    7
walo    8
siyam    9