Conflict resolution does not attempt a re-synchronization on the iFolder. If you select a local copy instead of a server copy, the file is synchronized only in the next synchronization cycle unless you perform a forced manual sync. If you select a server copy, re-synchronization is not required.