Fix bad formatting after merge