/conflict_resolution

there can sometimes be hard rebases

This repository is not active