fix code formatting after merge