Conflict in Makefile, fixed with formatting corrections
Attach a file by drag & drop or click to upload
