fixed merchant app