Sub for finding conflict files
Formatting
Merge branch 'develop'