repair merge Task #284005