Remove autocreated merge files