Fixes formatting errors

Removes weird merge formatting. Not sure when/how that happened.
Merge pull request #290 from laurenrother/forge32

Fixes formatting errors