fix conflicting macro