remove conflicting files