[B679] manual merge