Syncing conflicts

No other mechanism currently. See also: