@mennaamr you removed the wrong part when resolving the conflict when merging master probably. Line 21 to 24 shouldn't be deleted, and "has_and_belongs_to_many :idea_notifications", "has_and_belongs_to_many :user_notifications" should be removed