rewrote title to something brilliant
Resolved conflict in journal.txt by rewriting title