resolve conflict

aky15

2023-03-21 4dc3a1b011e1e72eb737417b8e0e0bec7a7e3a6e

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