changed story and edited last line making it bigger and shorter
fixed merging issues