send alert api/ fixed duplicate files
merged conflicts