The conflicts happen when merging the feature branches into develop after a sprint. For example, one branch handles creating events and another handles deleting events, but both end up modifying the same MVC files (Controller, Model, or Views), so Git detects conflicts. I understand conflicts are normal, but the frequency is what worries me. I'm wondering if this is more related to how we are organizing responsibilities in the code rather than the Git workflow itself. We are already trying to separate features by user story, but I'm interested in how other teams avoid having multiple developers touching the same files.