delete file from /uploads folder
Merge remote-tracking branch 'origin/master'