Well, these goals are about sustainability of batteries and electric related “stuff” in general not just phones. Phone affect us the most in terms of everyday life and addiction but in terms of long term impact to the environment and what we need to focus on the most that’s a harder nut to crack b/c we don’t know how growth will happen moving forward. So I think this makes sense to have a broad/sweeping legislation that covers lots of mediums and has different targets depending on the size/usage of the “thing”. Obviously removing a battery from a car is not the same thing (in terms of complexity or even ‘need’) as removing a battery from an electric scooter.
I think the idea is both are adding new files and also making changes to various files but his commits to the non-new files caused the conflict. Also, if both new files affect the same deliverable (like a DLL) then that could create a conflict in some cases (though I think that all depends on the build system).