fix issue conflict conflicting types