The whole codebase was recently reformatted with "pyformat" (dbaafbc). Could you please share how that was configured? Forks based on the unformatted code are going to have a ton of merge conflicts and it would be easiest to format them in the same manner before trying to merge. I tried running pyformat but it didn't match. Is that actually the tool that was used?