VE-1558 Fix bad merge and replace wrong message label