(Temporarily) disabling GitLens extension when resolving merge conflicts for a lot of files solved it.