fix file conflict