merging changes I made in a local repository with the material here