refactoring to identify conflict files#40

xrisbarney wants to merge 3 commits into

mainSamsonIdowu/DaC:mainfrom

rule-conflictSamsonIdowu/DaC:rule-conflictCopy head branch name to clipboard