Display conflict dialog when a bookmark is deleted on one side and changed on the other side
Calculate coordinate equality correctly
Display bookmark status in conflict dialog