Fixed conflicting types