rebase old exercise solutions