merged the mock app