Fix rebase
Fix rebase

tanojaja/copay,cobit-wallet/cobit,Kirvx/copay,Groestlcoin/GroestlPay,troggy/unicoisa,JDonadio/copay,troggy/unicoisa,mpolci/copay,troggy/colu-copay-wallet,Kirvx/copay,msalcala11/copay,tanojaja/copay,hideoussquid/aur-copay,ajp8164/copay,bitjson/copay,troggy/colu-copay-wallet,bitjson/copay,cmgustavo/copay,urv2/wallet,bitchk-wallet/copay,bitchk-wallet/copay,tanojaja/copay,JDonadio/copay,gabrielbazan7/copay,urv2/wallet,dabura667/copay,urv2/wallet,fr34k8/copay,fr34k8/copay,Bitcoin-com/Wallet,ajp8164/copay,matiu/copay,Groestlcoin/GroestlPay,cobit-wallet/cobit,gabrielbazan7/copay,gabrielbazan7/copay,fr34k8/copay,hideoussquid/aur-copay,Groestlcoin/GroestlPay,JDonadio/copay,ajp8164/copay,janko33bd/copay,cobit-wallet/cobit,troggy/colu-copay-wallet,janko33bd/copay,bitchk-wallet/copay,fr34k8/copay,cmgustavo/copay,javierbitpay/copay,mpolci/copay,dabura667/copay,bitjson/copay,matiu/copay,ObsidianCryptoVault/copay,hideoussquid/aur-copay,troggy/unicoisa,Kirvx/copay,gabrielbazan7/copay,Kirvx/copay,javierbitpay/copay,Bitcoin-com/Wallet,hideoussquid/aur-copay,ObsidianCryptoVault/copay,janko33bd/copay,javierbitpay/copay,cmgustavo/copay,Bitcoin-com/Wallet,javierbitpay/copay,tanojaja/copay,urv2/wallet,msalcala11/copay,Groestlcoin/GroestlPay,troggy/colu-copay-wallet,cmgustavo/copay,bitjson/copay,ObsidianCryptoVault/copay,mpolci/copay,JDonadio/copay,ObsidianCryptoVault/copay,dabura667/copay,Bitcoin-com/Wallet,troggy/unicoisa,matiu/copay,mpolci/copay,msalcala11/copay,matiu/copay,msalcala11/copay