chore: Update snapshots

Author: gambinish

ui/components/app/assets/nfts/nft-details/__snapshots__/nft-full-image.test.js.snap

@@ -81,17 +81,6 @@ exports[`NFT full image should match snapshot 1`] = `
                     </div>
                   </div>
                 </button>
-<<<<<<< HEAD
-=======
-                <p
-                  class="mm-box mm-text mm-text--body-sm mm-text--ellipsis mm-box--color-text-default"
-                />
-                <p
-                  class="mm-box mm-text mm-text--body-sm mm-text--ellipsis mm-box--color-text-alternative"
-                >
-                  Punk #4
-                </p>
->>>>>>> main
               </div>
             </div>
           </div>