GitHub repository: tpkahlon/merge-conflicts
Primary language: HTML
Description: Testing git, vim and merge conflicts.