Merging flashcard changes