fix conflict

Signed-off-by: zwwhdls <zwwhdls@hotmail.com>

pkg/strvals/parser.go

@@ -314,16 +314,11 @@ func (t *parser) listItem(list []interface{}, i int) ([]interface{}, error) {
 			}
 		}
 		// Now we need to get the value after the ].
-<<<<<<< HEAD
-		list2, err := t.listItem(crtList, i)
+		list2, err := t.listItem(crtList, nextI)
 		if err != nil {
 			return list, err
 		}
 		return setIndex(list, i, list2)
-=======
-		list2, err := t.listItem(crtList, nextI)
-		return setIndex(list, i, list2), err
->>>>>>> fix another extreme case
 	case last == '.':
 		// We have a nested object. Send to t.key
 		inner := map[string]interface{}{}