removed duplicated code from auto-merge.
Merge pull request #412 from ozone-development/bug/411/file-upload-history

merged