I'm assuming Hibiki used the 2nd wish to swap personalities with the MC as well. Which leads to having the one wish left and offering to swap back at the end if he wants to. Ironically enough, I'm sure they got the suitcase full of money from her father's accounts in the first place and he just didn't know it.