Manage conflicts between clients
UI to add bookmark with ari and kind input
Fix bug in managing conflict