Changing the dart_style version fixed it for me.
The conflict appeared when I copied some files from one project to the other.