I had a folder on github, say `folder` which I renamed to `folder1` a few commits ago. I now see that both `folder` and `folder1` show up in my repository. How can I remove the old folder. I have tried git rm and git mv but they don't work because `folder` doesn't exist in my directory tree anymore.