change bullets in notifications
resolve merge conflict