fix file Conflicts