Update lesson four and five with merge code