I should have written a disclaimer - I am not a part of this project nor am I affiliated with them in any way. It just looked great from the DX perspective, but I didnt stumble upon any mention of conflict resolution.