GitHub repository: karissa/knead
Description: Resolve Not Small Data Conflicts with manual merging