README: some words on conflict resolution

README.rst

@@ -112,12 +112,9 @@ password to the keyring via::
 
     keyring set pycarddav:$account $username
 
-where $account is the name of an account as configured in your
-configuration
-file and $username is the corresponding username (and then have no
-password
-configured for that account). For more details on configuring keyring
-have a
+where $account is the name of an account as configured in your configuration
+file and $username is the corresponding username (and then have no password
+configured for that account). For more details on configuring keyring have a
 look at its documentation_.
 
 .. _keyring: https://pypi.python.org/pypi/keyring
@@ -142,6 +139,14 @@ to the CA's root file (must be in pem format). If you don't want any certificate
 checking set *verify* to *false* to disable *any* ssl certificate checking (this
 is not recommended).
 
+Conflict Resolution
+-------------------
+
+In case of conflicting edits (local VCard changed while remote VCard also
+changed), are "resolved" by pycarddav through overwriting the local VCard with
+the remote one (meaning local edits are lost in this case). Syncing more
+frequently can prevent this.
+
 Additional Information
 ----------------------
 For now, VCard properties that have no value are not shown.