Merging master to flashCard