subject added in notification and fixing conflict