Git conflicts not related to files I changed in branch

Question

I\'m trying to rebase a branch but it\'s bringing up conflicts not related to my branch.

So I created branch app/feature-1 and made my changes Then I bra