fix conflicting types