<p><a href="https://github.com/zoq" class="user-mention">@zoq</a>  i guess i've fixed the merge conflicts (It was because my LeakyReLU branch didn't have Hardtanh file which was recently merged in upstream/master?). Its showing "This branch has no conflicts with the base branch", is it showing problems while merging? </p>

<p style="font-size:small;-webkit-text-size-adjust:none;color:#666;">&mdash;<br>Reply to this email directly or <a href="https://github.com/mlpack/mlpack/pull/549#issuecomment-194292199">view it on GitHub</a>.<img alt="" height="1" src="https://github.com/notifications/beacon/AJ4bFKq3EkIDoQyAVeJCOt4inTmffRTpks5prseKgaJpZM4Ho2zN.gif" width="1" /></p>
<div itemscope itemtype="http://schema.org/EmailMessage">
<div itemprop="action" itemscope itemtype="http://schema.org/ViewAction">
  <link itemprop="url" href="https://github.com/mlpack/mlpack/pull/549#issuecomment-194292199"></link>
  <meta itemprop="name" content="View Pull Request"></meta>
</div>
<meta itemprop="description" content="View this Pull Request on GitHub"></meta>
</div>