I rebased my branch and encountered conflicts, which I resolved. I would now like to stage the resolved conflicts. This is not working. On the right site it is clearly saying "File conflicts are resolved. You can stage this file now.". But it is not working. Edit: I can manually stage it with `git stage .`.