Merger conflict for components not included.

In some scenarios, it is possible to find that the conflicting files in the merge process are not related to the components we have discussed in the User Story.
          
           
Why does this happen?
 
 Copado does not merge specific files between branches to update them, Copado merges entire branches.

 So the merge process is performed on all the files that contain the branches and if the branches are not synchronized between them will appear files that have not been commented in the User Story as conflicts that must be resolved because there are differences in these files.

How did we do?