modified generation of result files
resolved conflict