Adding logic for naming result file
Fixing merge conflict