Fix formatting after merge