fix bad notification
Mergeconflict resolution.