Fixing formatting errors and a merge conflict I missed