changes in buyFund.jsp
buyFund conflict resolved