fixed indentation error on merchant.py