Fix spacing from last merge