Remove conflicting files