fix file internal merge issue after auto merge