Show git conflicts with priority
Merge branch 'gitConflict'