/conflict_resolution

there can sometimes be hard rebases

No issues in this repository yet.