merge files errors removed