Temporately changed \r\n to \n when reading any input file to fix inconsistencies between operating systems. Also turned off autocrlf in git
Solved merge conflict