Fixed merge issue

Recopied drinkcats version of the file, I had some garbage added for some reason.