inadvertently made changes to master that I want to keep