resolve conflict

aky15

2023-04-12 dccbcc48a583eb38b4bc5b459d417087826846ac

1
2
3
4
5
6
7
8
+    plus
-    minus
/    divided
÷    divided
:    divided
×    times
*    times
·    times