Fixes duplicated dismiss from merge