fix merge

.test/task2/validate

@@ -43,21 +43,21 @@ echo "# Verify that program works correctly after conflict resolution"
 read -r -d '\0' EXPECTED<<EOF
 comparing 40 and 4
 comparing 40 and 20
-comparing 4 and 20
+comparing 4 and 40
 comparing 40 and 10
-comparing 20 and 10
-comparing 4 and 10
+comparing 20 and 40
+comparing 4 and 40
 comparing 40 and 30
-comparing 20 and 30
+comparing 20 and 40
 comparing 40 and 6
-comparing 30 and 6
-comparing 20 and 6
-comparing 10 and 6
-comparing 4 and 6
+comparing 30 and 40
+comparing 20 and 40
+comparing 10 and 40
+comparing 4 and 40
 comparing 40 and 10
-comparing 30 and 10
-comparing 20 and 10
-comparing 10 and 10
+comparing 30 and 40
+comparing 20 and 40
+comparing 10 and 40
 [4, 6, 10, 10, 20, 30, 40]
 \0
 EOF

src/sort.py

@@ -5,7 +5,7 @@
  a_i = arr[i]
  j = i - 1
  while j >= 0:
- print("comparing {} and {}".format(arr[j], arr[i]))
+ print("comparing {} and {}".format(arr[j], a_i))
  if arr[j] > a_i:
  arr[j + 1] = arr[j]
  else: