Adds logic to retrieve all the files that are related to a given branch.
Adds file conflict method
Refactors the conflict detection code.
Adds test for NotificationUtils