Conflict resolution logic

Handle conflicts when multiple devices edit the same feed entry, resolving with the most accurate data.