Resolved merge conflict.

diff --cc CRM/Wci/Form/CreateWidget.php
Simple merge

diff --cc templates/CRM/Wci/Page/wciwidget.tpl
index 2c922ebd5903ca277f5ac26602f28cac0436a5ee,564758fb829f7979898077f7ef6481bb502cd8c2..b0883babb8316995a09b7f72bb6a5eb4c99faa9d
--- 1/templates/CRM/Wci/Page/wciwidget.tpl
--- 2/templates/CRM/Wci/Page/wciwidget.tpl
+++ b/templates/CRM/Wci/Page/wciwidget.tpl
@@@ -177,26 -177,16 +177,26 @@@
      <div class="crm-wci-button-wrapper" id="crm_wid_{$wciform.widgetId}_button">
          <a href='{crmURL p="civicrm/contribute/transact" q="reset=1&id=$cpageId" h=0 a=1 fe=1}' class="crm-wci-button"><span class="crm-wci-button-inner" id="crm_wid_{$wciform.widgetId}_btn_txt">{$wciform.button_title}</span></a>
      </div>
 -    {$wciform.embed}
 +    
      {if $wciform.email_signup_group_id}
 +      {if $embed eq 1 }
          <form method="get" action="{$wciform.emailSignupGroupFormURL}" name="Subscribe">
-         <p style="text-align:center;">
 +      {/if}
 +        <p style="text-align:center; margin: 0;">
 +          Get the monthly newsletter
 +        </p>
+         <p style="text-align:left;">email id:
            <input type="text" id="frmEmail" name="email" size="10">
          </p>
 -        <input id="mark_x_2" name="mark_x_2" type="hidden" value="1">
          <p style="text-align: center; margin-top: 10px;">
 -          <input type="submit" name="_qf_Subscribe_next" value="Subscribe Me">
 +          {if $embed eq 1 }
 +            <input type="submit" name="_qf_Subscribe_next" value="Subscribe Me">
 +          {else}
 +            <input type="button" name="_qf_Subscribe_next" value="Subscribe Me">
 +          {/if}
          </p>
 +      {if $embed eq 1 }
          </form>
 +      {/if}
      {/if}
  </div>