test: resolve v11.0.3 merge conflict in internal_transaction_test

Upstream v11.0.3 removed the 'doesn't delete pending block operations
after block import if no async process was requested' test; accept that
removal. Keep the DOS-custom 'filter_non_traceable_transactions/1'
describe block (zetachain test) which exists only on the DOS side.

Resolved file == upstream v11.0.3 + the 13-line DOS describe block, verified
by diff.

Author: JOY

apps/indexer/test/indexer/fetcher/internal_transaction_test.exs

@@ -341,42 +341,6 @@ defmodule Indexer.Fetcher.InternalTransactionTest do
     end
   end
 
-<<<<<<< HEAD
-  test "doesn't delete pending block operations after block import if no async process was requested", %{
-    json_rpc_named_arguments: json_rpc_named_arguments
-  } do
-    fetcher_options =
-      Keyword.merge([poll: true, json_rpc_named_arguments: json_rpc_named_arguments], InternalTransaction.defaults())
-
-    if fetcher_options[:poll] do
-      expect(EthereumJSONRPC.Mox, :json_rpc, fn [%{id: id}], _options ->
-        {:ok, [%{id: id, result: []}]}
-      end)
-    end
-
-    InternalTransaction.Supervisor.Case.start_supervised!(fetcher_options)
-
-    %Ecto.Changeset{valid?: true, changes: block_changes} =
-      Block.changeset(%Block{}, params_for(:block, miner_hash: insert(:address).hash, number: 1))
-
-    changes_list = [block_changes]
-    timestamp = DateTime.utc_now()
-    options = %{timestamps: %{inserted_at: timestamp, updated_at: timestamp}}
-
-    assert [] = Repo.all(PendingBlockOperation)
-
-    {:ok, %{blocks: [%{number: block_number, hash: block_hash}]}} =
-      Multi.new()
-      |> Blocks.run(changes_list, options)
-      |> Repo.transaction()
-
-    assert %{block_number: ^block_number, block_hash: ^block_hash} = Repo.one(PendingBlockOperation)
-
-    Process.sleep(4000)
-
-    assert %{block_number: ^block_number, block_hash: ^block_hash} = Repo.one(PendingBlockOperation)
-  end
-
   describe "filter_non_traceable_transactions/1" do
     test "does not raise when transaction params do not include type on zetachain" do
       chain_type = Application.get_env(:explorer, :chain_type)
@@ -390,8 +354,6 @@ defmodule Indexer.Fetcher.InternalTransactionTest do
     end
   end
 
-=======
->>>>>>> v11.0.3
   if Application.compile_env(:explorer, :chain_type) == :arbitrum do
     test "fetches internal transactions from Arbitrum", %{
       json_rpc_named_arguments: json_rpc_named_arguments