merge lecture 7