solve conflicts
adjust some notifications text [Fix #47818011]
just some adjusts on notification texts