updated merchants, profile bug fixes