Merger conflict for components not included.
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.