removed conflicting files