fix rebase conflicts
fix rebase conflicts

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