But `resolve` resolves the conflicts. I guess as someone who has written clients and client apps this all seems incredibly straightforward to me.