fix compilation (import overwrites)

app/controllers/LilaController.scala

@@ -1,6 +1,5 @@
 package controllers
 
-import lila.notify.Notification.Notifies
 import ornicar.scalalib.Zero
 import play.api.data.Form
 import play.api.http._
@@ -10,13 +9,13 @@ import play.api.mvc._, Results._
 import play.api.mvc.WebSocket.FrameFormatter
 import play.twirl.api.Html
 import scalaz.Monoid
-import lila.notify.{Notification}
 
 import lila.api.{ PageData, Context, HeaderContext, BodyContext, TokenBucket }
 import lila.app._
 import lila.common.{ LilaCookie, HTTPRequest }
 import lila.security.{ Permission, Granter, FingerprintedUser }
 import lila.user.{ UserContext, User => UserModel }
+import lila.notify.Notification.Notifies
 
 private[controllers] trait LilaController
     extends Controller

app/templating/NotificationHelper.scala

@@ -9,7 +9,7 @@ import play.api.mvc.Call
 
 trait NotificationHelper {
 
-  def notifications(user: User): Html = {
+  def renderNotifications(user: User): Html = {
     val notifs = notificationEnv.api get user.id take 2 map { notif =>
       views.html.notification.view(notif.id, notif.from)(Html(notif.html))
     }

app/views/base/layout.scala.html

@@ -164,7 +164,7 @@ withLangAnnotations: Boolean = true)(body: Html)(implicit ctx: Context)
     <div class="content @ctx.is3d.fold("is3d", "is2d")">
       <div id="site_header">
         @ctx.me.map { me =>
-        <div id="notifications">@notifications(me)</div>
+        <div id="notifications">@renderNotifications(me)</div>
         }.getOrElse {
         <div id="notifications"></div>
         }