GitHub repository: shpingalet007/conflictor
Primary language: JavaScript
Description: Repository conflict resolver