Fixes formatting errors

Removes weird merge formatting. Not sure when/how that happened.