3 ms·

We're definitely looking at adding more options for custom conflict resolution once we get out of beta.