add test to notifications
resolve conflict