Resolved conflict in flashcards