fix conflict issue

contracts/feralfile-exhibition-v4/feralfile.go

@@ -200,7 +200,6 @@ func (c *FeralfileExhibitionV4Contract) Call(
 		t.GasLimit = gasLimit
 
 		return contract.SetApprovalForAll(t, operator, approved)
-<<<<<<< HEAD
 	case "safeTransferFrom":
 		if len(params) != 3 {
 			return nil, fmt.Errorf("invalid params")
@@ -225,14 +224,12 @@ func (c *FeralfileExhibitionV4Contract) Call(
 			from,
 			to,
 			tokenID)
-=======
 	case "setAdvanceSetting":
 		if len(params) != 2 {
 			return nil, errors.New("Invalid parameters")
 		}
 
 		return contract.SetAdvanceSetting(t, params[0].([]common.Address), params[1].([]*big.Int))
->>>>>>> develop
 	default:
 		return nil, fmt.Errorf("unsupported method")
 	}
@@ -400,6 +397,10 @@ func (c *FeralfileExhibitionV4Contract) Parse(
 			To      common.Address  `json:"to"`
 			TokenID ethereum.BigInt `json:"token_id"`
 		}
+		if err := json.Unmarshal(arguments, &params); err != nil {
+			return nil, err
+		}
+
 		return []interface{}{params.From, params.To, &params.TokenID.Int}, nil
 	case "setAdvanceSetting":
 		var params struct {
@@ -409,7 +410,7 @@ func (c *FeralfileExhibitionV4Contract) Parse(
 		if err := json.Unmarshal(arguments, &params); err != nil {
 			return nil, err
 		}
-		
+
 		advanceAmounts := make([]*big.Int, len(params.AdvanceAmounts))
 		for i, v := range params.AdvanceAmounts {
 			amount := v.Int // closure issue