merchant controller chanegd..