fix conflict from smartmax merge