Removed Merge conflicts in text.
Pushing new resize file.
Merge pull request #5 from MorganDawe/master

Updated merge conflict issues