remove plist upload
ignore some fails
fix merge files