/gitConflicts

Usefull for resolving conflicts

gitConflicts

Useful for resolving conflicts