Fixed some whitespace issues that appeared after the merge