Added Jam.txt
Fixed a merge conflict