Fix formatting error after rebase