Auto-resolving conflict with unison

I've given up on time stamp and settled for prioritising one version by adding the argument

-prefer /path/to/folder1

which resolves the conflicts.