GitHub repository: push-pull-repeat/MergeConflict
Primary language: HTML
Description: Practice how to merge conflicts