merge in class week 11