zlacker

The point is that the merge conflict was resolved, regardless of whether there was a working product at the end. Which there apparently isn’t.