Put output into a file that can be specified on the command line call
Merge conflict solved