[Fix] - Corrent the bugs when mergering multiple files
Merge branch 'master' of github.com:migocorp/athena