Just added a sentance to help with a widowed line... lulz.
Fixed merge conflicts.