fixed merging errors with loan.py