Add get_my_funds method
Resolve merge conflicts