 
   accountChanged:(account)->
 
-<<<<<<< HEAD
-    {notificationsPopup} = this
-
-    notificationsPopup.listController.removeAllItems()
-
-    if KD.isLoggedIn()
-      # Fetch Notifications
-      notificationsPopup.listController.fetchNotificationTeasers (err, notifications)=>
-        return warn "Notifications cannot be received", err  if err
-        notificationsPopup.listController.instantiateListItems notifications
-=======
     {listController} = @notificationsPopup
     listController.removeAllItems()
 


    # Fetch Notifications
    KD.utils.defer ->
      listController.fetchNotificationTeasers (teasers)->
        listController.instantiateListItems filterNotifications teasers



      try
        snapshot = JSON.parse Encoder.htmlDecode notification.snapshot
        snapshot.anchor.constructorName in activityNameMap
