fix history with multi merge