1 files changed, 8 insertions, 0 deletions
diff --git a/packages/contract-wrappers/test/erc20_wrapper_test.ts b/packages/contract-wrappers/test/erc20_wrapper_test.ts
index dd15a9b82..ae47a11ad 100644
--- a/packages/contract-wrappers/test/erc20_wrapper_test.ts
+++ b/packages/contract-wrappers/test/erc20_wrapper_test.ts
@@ -528,7 +528,11 @@ describe('ERC20Wrapper', () => {
         it('Outstanding subscriptions are cancelled when contractWrappers.setProvider called', (done: DoneCallback) => {
             (async () => {
                 const callbackNeverToBeCalled = callbackErrorReporter.reportNodeCallbackErrors(done)(
+<<<<<<< HEAD:packages/contract-wrappers/test/erc20_wrapper_test.ts
                     (logEvent: DecodedLogEvent<ERC20TokenApprovalEventArgs>) => {
+=======
+                    (_logEvent: DecodedLogEvent<ApprovalContractEventArgs>) => {
+>>>>>>> v2-prototype:packages/contract-wrappers/test/token_wrapper_test.ts
                         done(new Error('Expected this subscription to have been cancelled'));
                     },
                 );
@@ -557,7 +561,11 @@ describe('ERC20Wrapper', () => {
         it('Should cancel subscription when unsubscribe called', (done: DoneCallback) => {
             (async () => {
                 const callbackNeverToBeCalled = callbackErrorReporter.reportNodeCallbackErrors(done)(
+<<<<<<< HEAD:packages/contract-wrappers/test/erc20_wrapper_test.ts
                     (logEvent: DecodedLogEvent<ERC20TokenApprovalEventArgs>) => {
+=======
+                    (_logEvent: DecodedLogEvent<ApprovalContractEventArgs>) => {
+>>>>>>> v2-prototype:packages/contract-wrappers/test/token_wrapper_test.ts
                         done(new Error('Expected this subscription to have been cancelled'));
                     },
                 );