committing changes so that I can merge