Better support for automatic merging

[Nekidev]

Lets imagine that a user updates the same field of the same library entry at the same time in both the app and in an external account. We should probably track the updates the user has made since the last sync with the account and prompt them to select which version of the updated data they wish to keep so that no data is unintentionally lost.