fixed merged conflicts

Learn is still glitching at the end with the last card, and at the
beginning with the first card. Some problems with starring function