GitHub repository: GMahomed/MergeConflicts
Description: Lets simulate some merge conflicts