Actually added merge lesson this time