The following file found contains the merge conflict that needs to be fixed with your Git merge tool of choice:
/data/revisions/{{exception.FileName}}
A common merge conflict happens when yourself or another developer adds a new property to a document type directly on the Cloud site and you forget to pull down the latest changes from the Git repository and decide to work on the same document type locally.
Unsure how to fix a merge conflict, then GitHub has a great guide on this