diff --git a/swift/Tests/CoinAddressDerivationTests.swift b/swift/Tests/CoinAddressDerivationTests.swift
index de7121f247b..49e0a468cb3 100644
--- a/swift/Tests/CoinAddressDerivationTests.swift
+++ b/swift/Tests/CoinAddressDerivationTests.swift
@@ -105,13 +105,10 @@ class CoinAddressDerivationTests: XCTestCase {
                      .klaytn,
                      .meter,
                      .okxchain,
-<<<<<<< HEAD
-                     .gatechain:
-=======
                      .confluxeSpace,
                      .opBNBtestnet,
-                     .acalaEVM:
->>>>>>> master
+                     .acalaEVM,
+                     .gatechain:
                     let expectedResult = "0x8f348F300873Fd5DA36950B2aC75a26584584feE"
                     assertCoinDerivation(coin, expectedResult, derivedAddress, address)
                 case .ronin: