Merge notification crash fix