merge smart signer changes, resolve conflicts