Fix code styling

that got missed in the merge conflict