diff --git a/models/gold/core/core__fact_traces.yml b/models/gold/core/core__fact_traces.yml
index d7650d4..dd3f721 100644
--- a/models/gold/core/core__fact_traces.yml
+++ b/models/gold/core/core__fact_traces.yml
@@ -5,47 +5,17 @@ models:
 
     columns:
       - name: BLOCK_NUMBER
-<<<<<<< HEAD
         description: '{{ doc("evm_traces_block_no") }}'   
-=======
-        description: '{{ doc("blast_traces_block_no") }}'
->>>>>>> origin/main
       - name: BLOCK_TIMESTAMP
         description: '{{ doc("evm_traces_blocktime") }}'
       - name: TX_HASH
-<<<<<<< HEAD
         description: '{{ doc("evm_traces_tx_hash") }}' 
       - name: TX_POSITION
         description: '{{ doc("evm_tx_position") }}' 
-=======
-        description: '{{ doc("blast_traces_tx_hash") }}'
-      - name: TX_POSITION
-        description: The position of the transaction within the block.
-      - name: TRACE_INDEX
-        description: The index of the trace within the transaction.
->>>>>>> origin/main
       - name: FROM_ADDRESS
         description: '{{ doc("evm_traces_from") }}'
       - name: TO_ADDRESS
-<<<<<<< HEAD
         description: '{{ doc("evm_traces_to") }}'
-=======
-        description: '{{ doc("blast_traces_to") }}'
-      - name: INPUT
-        description: '{{ doc("blast_traces_input") }}'
-      - name: OUTPUT
-        description: '{{ doc("blast_traces_output") }}'
-      - name: TYPE
-        description: '{{ doc("blast_traces_type") }}'
-      - name: TRACE_ADDRESS
-        description: This field represents the position of the trace within the transaction.
-      - name: SUB_TRACES
-        description: '{{ doc("blast_traces_sub") }}'
-      - name: IDENTIFIER
-        description: '{{ doc("blast_traces_identifier") }}'
-      - name: DATA
-        description: '{{ doc("blast_traces_call_data") }}'
->>>>>>> origin/main
       - name: VALUE
         description: '{{ doc("evm_traces_value") }}'
       - name: VALUE_PRECISE_RAW
@@ -57,7 +27,6 @@ models:
       - name: GAS
         description: '{{ doc("evm_traces_gas") }}'
       - name: GAS_USED
-<<<<<<< HEAD
         description: '{{ doc("evm_traces_gas_used") }}'
       - name: INPUT
         description: '{{ doc("evm_traces_input") }}'
@@ -96,30 +65,3 @@ models:
 
 
         
-=======
-        description: '{{ doc("blast_traces_gas_used") }}'
-      - name: ORIGIN_FROM_ADDRESS
-        description: The from address at the transaction level.
-      - name: ORIGIN_TO_ADDRESS
-        description: The to address at the transaction level.
-      - name: ORIGIN_FUNCTION_SIGNATURE
-        description: The function signature at the transaction level.
-      - name: TRACE_STATUS
-        description: The status of the trace, either `SUCCESS` or `FAIL`
-      - name: TRACE_SUCCEEDED
-        description: Whether the trace succeeded or failed
-      - name: ERROR_REASON
-        description: The reason for the trace failure, if any.
-      - name: REVERT_REASON
-        description: The reason for the trace revert, if any.
-      - name: TX_STATUS
-        description: '{{ doc("blast_tx_status") }}'
-      - name: TX_SUCCEEDED
-        description: Whether the transaction succeeded or failed
-      - name: FACT_TRACES_ID
-        description: '{{ doc("pk") }}'
-      - name: INSERTED_TIMESTAMP
-        description: '{{ doc("inserted_timestamp") }}'
-      - name: MODIFIED_TIMESTAMP
-        description: '{{ doc("modified_timestamp") }}'
->>>>>>> origin/main