I know it might be hard to implement but reloading all data by restarting OF is like cheating. It should be a differential change. All changes that are safe should just be made in the background. Only if a conflict arrise should the user be asked how to proceed. The dialog that apple is using for contacts/iCal etc. is pretty good. You see the conflicting item and you choose which change to use.