repair merge comment