fix formatting after merge