You may have to manually step through the conflicts menu to resolve them, choosing which device's version to keep. But typically that won't happen unless both device's versions of a file change at the same time.