Rogue Code being injected and reported as Conflict

We have a Repository with a few branches the problem in particular is that a folder with a few files doesnt exist in the one branch but when we create a PR from the branch that does have this folder and files t othe one that doesnt it reports a conflict and it conflicts with code that is in a COMPLETELY unrelated file.