GitHub repository: r-ohlan/Demo_Merge_conflicts
Primary language: Python
Description: Just a demo to see how to resolve merge conflicts